Commit Graph

2331 Commits

Author SHA1 Message Date
liaochuntao
fea2c674bd
Merge pull request #2687 from Maijh97/develop
Modify log output
2020-05-21 21:44:04 +08:00
liaochuntao
4ddfe0c1c3
Merge pull request #2691 from jiangcaijun/develop
hashMap constructor : choose more appropriate initialCapacity
2020-05-21 21:37:33 +08:00
liaochuntao
bcec069e90
Merge pull request #2675 from alibaba/dependabot/maven/com.fasterxml.jackson.core-jackson-databind-2.9.10.4
build(deps): bump jackson-databind from 2.9.10.3 to 2.9.10.4
2020-05-21 21:35:13 +08:00
liaochuntao
99859bdcb4
Merge pull request #2754 from ObserverYu/develop
[ISSUE #2755]解决修改contextPath后出现no such api异常
2020-05-21 21:34:32 +08:00
yanlinly
405e2c8fe4
Merge pull request #2828 from alibaba/hotfix_config_dump
[ISSUE 2827]: hotfix config dump
2020-05-21 17:54:08 +08:00
chuntaojun
c4a93d1c37 refactor: code refactor 2020-05-20 15:45:15 +08:00
chuntaojun
10d8edb4f3 refactor: optimize code logic 2020-05-19 14:16:52 +08:00
chuntaojun
b8dddf0ec1 refactor: block initialization before dump completes 2020-05-19 14:04:11 +08:00
chuntaojun
610024dd07 refactor: remove unuse dir 2020-05-19 10:21:22 +08:00
chuntaojun
f9412fd4d6 fix: fix config dump 2020-05-18 22:57:40 +08:00
yanlinly
b10745b87e
update travis.yml
mvn clean package -Pit-test
2020-05-15 18:58:02 +08:00
chuntaojun
afc74da826 build: update version to 1.3.0-BETA 2020-05-15 16:10:38 +08:00
liaochuntao
885210a6ca
Merge pull request #2813 from alibaba/feature_1.3.0_beta
refactor: jraft node removal logic optimization
2020-05-15 15:21:49 +08:00
chuntaojun
a317c7a80b refactor: jraft node removal logic optimization 2020-05-15 15:20:39 +08:00
liaochuntao
ed1194218b
Merge pull request #2809 from alibaba/feature_1.3.0_beta
Fix shrinkage problem
2020-05-15 10:09:06 +08:00
chuntaojun
a928e7eb04 fix: fix node remove bug 2020-05-14 21:15:17 +08:00
chuntaojun
a37d6afe35 fix: fix member remove 2020-05-14 19:55:47 +08:00
chuntaojun
86652a47e3 fix: fix code style 2020-05-14 18:33:16 +08:00
water.lyl
2af4c40330 fix pmd problem 2020-05-14 18:20:40 +08:00
yanlinly
7d233e6f9f
Merge pull request #2806 from alibaba/feature_1.3.0_beta
Feature 1.3.0 beta
2020-05-14 17:27:44 +08:00
chuntaojun
52ea9674be fix: cluster startup mode adjustment 2020-05-14 10:15:35 +08:00
chuntaojun
a68f5e22cf fix: fix code style 2020-05-13 18:14:27 +08:00
LoadChange
8f021b2a65 Merge branch 'langghaha-fix_2609' into develop 2020-05-13 17:33:01 +08:00
LoadChange
59d444a4a1 Merge langghaha-fix_2609 2020-05-13 17:32:47 +08:00
chuntaojun
b6e5d9cc31 feat: open jraft-node metrics 2020-05-13 17:17:59 +08:00
chuntaojun
4d4e914ebd fix: fixed the cluster logic for the jraft set 2020-05-13 15:43:56 +08:00
chuntaojun
82bcbd9b17 refactor: jRaft partial logical adjustment 2020-05-13 09:38:46 +08:00
water.lyl
54e251da39 release 1.3-beta 2020-05-11 23:06:23 +08:00
yanlinly
abaf5d9650
Merge pull request #2785 from zongtanghu/feature_tenant_verify_v2
[#2738]add tenant legality verification.
2020-05-11 19:57:16 +08:00
zongtanghu
f46fa41d1e [#2738]add tenant legality verification. 2020-05-11 19:48:51 +08:00
yanlinly
5319b27803
Merge pull request #2784 from alibaba/revert-2783-feature_tenant_verify
Revert "[#2738]add tenant legality verification."
2020-05-11 19:35:39 +08:00
yanlinly
9f4061eed6
Revert "[#2738]add tenant legality verification." 2020-05-11 19:33:57 +08:00
yanlinly
99a74d7ed4
Merge pull request #2783 from zongtanghu/feature_tenant_verify
[#2738]add tenant legality verification.
2020-05-11 19:27:21 +08:00
zongtanghu
c2c752a969 Merge remote-tracking branch 'origin/feature_tenant_verify' into feature_tenant_verify
# Conflicts:
#	client/src/test/java/com/alibaba/nacos/client/BeatReactorTest.java
#	config/src/main/java/com/alibaba/nacos/config/server/controller/ConfigController.java
#	config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
#	config/src/main/java/com/alibaba/nacos/config/server/utils/ParamUtils.java
2020-05-11 18:57:41 +08:00
zongtanghu
71ce203768 [#2738]rebase and resolve conflict codes. 2020-05-11 18:13:06 +08:00
zongtanghu
b7207cbe73 [#2738]Put ParamUtils into origin place for tenant legality verification. 2020-05-11 18:06:20 +08:00
zongtanghu
0305c0d01f [#2738]add tenant legality verification. 2020-05-11 18:05:01 +08:00
yanlinly
ff3692164f
Merge pull request #2758 from alibaba/feature_1.3.0_beta
Feature 1.3.0 beta
2020-05-11 17:14:41 +08:00
zongtanghu
18de6388a0 [#2738]remove redundant codes. 2020-05-11 16:59:09 +08:00
chuntaojun
0aefb6f0cc refactor: retain the expansion logic 2020-05-11 16:52:03 +08:00
zongtanghu
f71c435f89 [#2738]remove redundant codes. 2020-05-11 16:51:06 +08:00
zongtanghu
e5491ec0de [#2738]fix another BeatReactorTest unit test failure. 2020-05-11 16:03:48 +08:00
zongtanghu
1bb7613ff2 [#2738]Put ParamUtils into origin place for tenant legality verification. 2020-05-11 15:57:53 +08:00
zongtanghu
2b091f1a5d [#2738]add tenant legality verification. 2020-05-11 11:13:38 +08:00
chuntaojun
5b22ddfb78 refactor: remove discovery-memberlookup 2020-05-10 17:16:02 +08:00
chuntaojun
6a6725a269 fix: fix expansion issues 2020-05-09 20:32:55 +08:00
chuntaojun
5879b03c7d fix: expansion and volume timing issue fixed 2020-05-09 14:49:04 +08:00
liaochuntao
d69954cb5f
Merge pull request #2766 from wangweizZZ/feature_1.3.0_beta
[ISSUE #2765]Optimize MemberUtils class's kRandom method
2020-05-09 11:27:26 +08:00
wangwei
beaa402ff7 [ISSUE #2765]Optimize MemberUtils class's kRandom method 2020-05-08 21:53:53 +08:00
liaochuntao
0be43f33bf
Merge pull request #2763 from zongtanghu/feature_1.3.0_beta
[#2761]ProtocolManager class's getCpProtocol()/getApProtocol() method ' codes can be optimized.
2020-05-08 19:10:42 +08:00