Commit Graph

2300 Commits

Author SHA1 Message Date
LoadChange
59d444a4a1 Merge langghaha-fix_2609 2020-05-13 17:32:47 +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
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
zongtanghu
27346a9f43 [#2761]ProtocolManager class's getCpProtocol()/getApProtocol() method' codes can be optimized. 2020-05-08 18:09:11 +08:00
liaochuntao
79a6f453d2
Merge pull request #2759 from chuntaojun/feature_consistency
refactor: fix bugs
2020-05-08 14:55:30 +08:00
chuntaojun
29a6edc8c5 refactor: fix bugs 2020-05-08 14:53:29 +08:00
liaochuntao
5208416a0a
Merge pull request #2531 from chuntaojun/feature_consistency
feat: #2530
2020-05-08 14:49:53 +08:00
chuntaojun
613a8d6c40 refactor: the raft port computes the rule changes 2020-05-07 11:08:10 +08:00
chuntaojun
5d6a0b539f fix: fix code style 2020-05-07 00:45:28 +08:00
chuntaojun
5e281892a1 refactor: remove debug log 2020-05-07 00:33:06 +08:00
chuntaojun
272abe6135 fix: fix parameter encode 2020-05-06 18:33:18 +08:00
chuntaojun
60b84a4981 refactor: merge upstream develop 2020-05-05 16:06:02 +08:00
chuntaojun
1563dc7104 fix: fixed a problem where parameters were encoded multiple times 2020-05-05 09:43:54 +08:00
chuntaojun
2526c5d8f2 fix: fix naming request redirect 2020-05-03 20:26:35 +08:00
chuntaojun
a82bcc1d6e fix: fix request transfer bug 2020-05-02 13:12:38 +08:00
chuntaojun
eca2aca6bb fix: bug fix 2020-05-01 10:09:08 +08:00
chuntaojun
eb11ff945b fix: fix standalone sync node info bug 2020-04-30 20:02:54 +08:00
chuntaojun
041effebc7 refactor: some code refactor 2020-04-30 13:46:04 +08:00
chuntaojun
a937e3090c fix: fix some bugs 2020-04-30 10:49:34 +08:00
chuntaojun
a025e56b3a fix: fix config dump bug 2020-04-28 15:08:38 +08:00
wfnuser
4baaef4b5a fix: ignore yarn-error log 2020-04-28 11:24:02 +08:00
wfnuser
986b543afd fix: allow empty line in config type preperties 2020-04-28 11:24:02 +08:00
zhenxianyimeng
6c495c045c keep query criteria 2020-04-28 11:20:48 +08:00
chuntaojun
dd4b577755 fix: fix double lock 2020-04-26 21:24:12 +08:00
chuntaojun
8b4a37724f refactor: address mode adds setting parameters 2020-04-26 16:29:19 +08:00
chuntaojun
bf94c96af1 refactor: none 2020-04-24 22:43:15 +08:00
chuntaojun
41e1f04914 refactor: code refactor 2020-04-24 22:42:02 +08:00
chuntaojun
9c970b60ba refactor: fix code stype 2020-04-23 19:43:42 +08:00
chuntaojun
e4c475295c refactor: remove complex logic, RPC ports can be customized 2020-04-23 15:22:16 +08:00
chuntaojun
853a8f587f refactor: core
logic optimization
2020-04-22 22:16:27 +08:00