Commit Graph

2473 Commits

Author SHA1 Message Date
chuntaojun
71217154bb fix: fix task executable judgment logic problems 2020-06-07 20:34:11 +08:00
杨翊 SionYang
c2e3530ee2
Merge pull request #2981 from alibaba/hotfix_jraft
[HOTFIX] Raft RPC being submitted to the Leader, error could not be…
2020-06-07 19:53:32 +08:00
chuntaojun
d916d221bf refactor: add ut 2020-06-07 19:25:10 +08:00
chuntaojun
5191838d77 fix: fixed Raft RPC being submitted to the Leader, error could not be returned 2020-06-07 18:16:46 +08:00
liaochuntao
fb85658f9f
Merge pull request #2972 from pigxcloud/develop
♻️ Refactoring pom. com.alibaba.nacos to ${project.groupId} Un…
2020-06-07 16:55:27 +08:00
lengleng
56eeb35ffc ♻️ Refactoring pom. com.alibaba.nacos to ${project.groupId} Uniform variable 2020-06-06 17:24:37 +08:00
yanlinly
8423e33dd0
Merge pull request #2965 from alibaba/hotfix_config_publish_log
HOTFIX: add config publish log
2020-06-05 10:53:25 +08:00
chuntaojun
364745e000 refactor: add config publish log 2020-06-05 10:50:29 +08:00
water.lyl
7b8bdc4e71 Merge branch 'develop' of github.com:alibaba/nacos into develop 2020-06-05 09:03:21 +08:00
water.lyl
7f541a9a67 update version to 1.3.0 2020-06-05 09:02:17 +08:00
yanlinly
fc96067a45
Merge pull request #2959 from KomachiSion/develop-fix-server-status-conflict-for-different-version
Fix 1.3 version don't report server status to lower version.
2020-06-04 15:20:49 +08:00
KomachiSion
3e37ac4bf2 Fix 1.3 version don't report server status to lower version. 2020-06-04 15:09:18 +08:00
yanlinly
f71c5d85c9
Merge pull request #2949 from alibaba/hotfix_config_clone
Hotfix config clone
2020-06-03 20:07:31 +08:00
chuntaojun
6271022648 refactor: roll-back AsyncNotifyService.java 2020-06-03 20:00:15 +08:00
chuntaojun
95eba16669 test: add ut 2020-06-03 19:50:25 +08:00
chuntaojun
0fbcb99ebb fix: fix code style 2020-06-03 19:35:28 +08:00
chuntaojun
a212641730 fix: fix front-end Long precision loss problem 2020-06-03 19:12:13 +08:00
yanlinly
7ac0ff83b8
Merge pull request #2947 from KomachiSion/develop-issue#2842
[ISSUE #2842] Replace all fastjson with jackson
2020-06-03 17:27:13 +08:00
KomachiSion
74a2995709 Remove fastjson LICENSE 2020-06-03 14:43:12 +08:00
KomachiSion
56da41357e Remove fastjson dependency from pom 2020-06-03 14:42:25 +08:00
KomachiSion
e9adf975af Replace fastjson with jackson for nacos-test/naming 2020-06-03 14:39:28 +08:00
KomachiSion
4dbe81418b Replace fastjson with jackson for nacos-test/auth 2020-06-03 14:39:17 +08:00
KomachiSion
c0b4385287 Replace fastjson with jackson for nacos-test/config 2020-06-03 14:39:05 +08:00
KomachiSion
9e21a2cf46 Replace fastjson with jackson for nacos-test/common 2020-06-03 14:38:23 +08:00
liaochuntao
5d9c0798d0
Merge pull request #2940 from Maijh97/fix_http_client_bug
[ISSUE #2939]
2020-06-02 21:18:38 +08:00
mai.jh
98ee23e248 fix: #2939 2020-06-02 14:53:09 +08:00
liaochuntao
184141fc57
Merge pull request #2923 from jintonghuoya/feature_maven_version_unity
[ISSUE #2860]Maven dependency optimizations, where only one version of each dependency exists
2020-06-02 14:47:26 +08:00
chuntaojun
a8bcf35b63 refactor: log print adjustment 2020-06-02 14:22:22 +08:00
chuntaojun
7c9f43dfdf refactor: add log printing 2020-06-02 14:17:38 +08:00
liaochuntao
3c23ed09b9
Merge pull request #2938 from alibaba/hotfix_naming_compatibility
[#2933] adjust where version information is inserted
2020-06-02 14:10:27 +08:00
chuntaojun
c196c8f52f fix: adjust where version information is inserted 2020-06-02 12:32:26 +08:00
yanlinly
dc9d1368fe
Merge pull request #2934 from alibaba/hotfix_naming_compatibility
[#2933] fixed compatibility issues with older versions
2020-06-02 10:55:01 +08:00
chuntaojun
01bb02b943 refactor: long volume, annotation optimization 2020-06-02 10:32:18 +08:00
chuntaojun
3169424605 refactor: optimize old version information synchronization logic 2020-06-01 21:54:29 +08:00
Jack Dai
1a7264d9b6 解决和develop的冲突 2020-06-01 18:41:03 +08:00
Jack Dai
83e6451acc 统一修改子项目中的url为nacos官网地址 2020-06-01 18:35:20 +08:00
chuntaojun
a7556fa776 fix: fix old version information not available in new version reality issue 2020-06-01 16:59:01 +08:00
chuntaojun
6fb2750021 fix: fixed compatibility issues with older versions 2020-06-01 15:35:21 +08:00
TsingLiang
a8c5a8da26
Merge pull request #2924 from alibaba/feature_1.3.0_beta_grpc_perf
Feature 1.3.0 beta grpc perf
2020-06-01 14:09:12 +08:00
chuntaojun
5fceafac3f refactor: optimize the error message prompt 2020-05-30 17:28:25 +08:00
chuntaojun
75c9a5e21b refactor: modift TimerContext logger level 2020-05-29 20:58:03 +08:00
jintonghuoya
6aa395979a 回滚dependency和plugin的version无关的修改 2020-05-29 20:45:45 +08:00
chuntaojun
a1b4653d68 fix: fix unit tests that do not conform to PMD 2020-05-29 20:14:52 +08:00
chuntaojun
5dcee2f1c6 fix: fix pmd 2020-05-29 19:59:08 +08:00
chuntaojun
dc416377dc fix: fix startup failure 2020-05-29 19:32:39 +08:00
Jack Dai
9692cd1b8c 合并和origin/develop的冲突 2020-05-29 19:01:48 +08:00
chuntaojun
a26f369d95 Merge remote-tracking branch 'origin' into feature_1.3.0_beta_grpc_perf 2020-05-29 18:42:16 +08:00
chuntaojun
a5661f033d feat: add the metircs 2020-05-29 18:42:14 +08:00
Jack Dai
27a257c84e 合并origin/develop的变更 2020-05-29 18:41:00 +08:00
TsingLiang
ea4a029ca4
Merge pull request #2918 from KomachiSion/develop-issue#2842
[ISSUE #2842] Fix serverStatus api jackson error
2020-05-29 17:41:17 +08:00