Commit Graph

2526 Commits

Author SHA1 Message Date
zongtanghu
d2b980677f [#1815]remove code comments. 2020-06-11 11:33:38 +08:00
zongtanghu
9b873797ca [#1815]fix ut. 2020-06-11 10:35:50 +08:00
zongtanghu
e6e3161c0e resolve the codes conflicts 2020-06-11 09:45:00 +08:00
zongtanghu
eb39830b6c [#1815]remove lifeCycle, lifeCycleManager, and adjust some related codes. 2020-06-11 09:42:44 +08:00
杨翊 SionYang
7ae740023d
Merge pull request #3023 from baolongcheng/develop
修针对mysql5.6版本使用innodb存储引擎,permissions表resouce字段长度过长,无法创建索引,建表出错,修改bug #3016
2020-06-11 09:08:32 +08:00
杨翊 SionYang
8d79eb68dd
Merge pull request #3025 from alloevil/patch-4
Update application.properties
2020-06-11 09:08:06 +08:00
allo
990a01b588
Update application.properties
spelling err correct
2020-06-10 23:54:07 +08:00
baolongcheng
6d24d37c71 修针对mysql5.6版本使用innodb存储引擎,permissions表resouce字段长度过长,无法建表问题 2020-06-10 21:24:09 +08:00
杨翊 SionYang
0a47bc7f2f
Merge pull request #3021 from jzdayz/develop
a power of two size for hashmap
2020-06-10 18:22:29 +08:00
huqingfeng
d21bbf4688 a power of two size for hashmap 2020-06-10 17:42:17 +08:00
杨翊 SionYang
f49eba341c
Merge pull request #2287 from rushsky518/sync_content
HttpCLient uses ByteArrayEntity when sync data
2020-06-10 16:21:07 +08:00
杨翊 SionYang
7f7ee0d5b3
Merge pull request #1877 from ly641921791/issue_1865
Fix #1865 use DriverManager instead of MysqlDataSource to get the connection
2020-06-10 14:26:46 +08:00
杨翊 SionYang
e6c578f4e2
Merge pull request #3008 from zhouhailin/develop
FIX ISSUE #3007 : MaxHistory字段名称和Nacos默认的命名风格不统一
2020-06-10 14:01:40 +08:00
杨翊 SionYang
ecf65eec01
Merge pull request #2849 from lin-mt/develop
fix:#2839
2020-06-10 10:35:43 +08:00
TsingLiang
510ffb5599
Merge pull request #2995 from alibaba/perf_config_notify
[#ISSUE 2994] Perf config notify
2020-06-10 10:06:37 +08:00
zhouhailin
2efe317597 FIX ISSUE #3007 : MaxHistory字段名称和Nacos默认的命名风格不统一 2020-06-09 23:02:18 +08:00
zongtanghu
8f7fb0f65a [#1815]remove no used package name from Factory Class and adjust test cases. 2020-06-09 14:10:47 +08:00
liaochuntao
38f33b4ab7
Merge pull request #2984 from showkawa/develop
hi.here 'addAll()' call can be replaced with paramterized constructor call,performance will be better
2020-06-08 23:44:03 +08:00
chuntaojun
769fe0254f ci: modify travis.yml 2020-06-08 23:39:50 +08:00
chuntaojun
902d609f1e perf: optimize configuration change event publishing 2020-06-08 23:38:53 +08:00
yanlinly
5203ee348b
Merge pull request #2990 from alibaba/hotfix_standalone_notify
[ISSUE 2989] where config publish could not trigger horizontal notification i…
2020-06-08 13:57:27 +08:00
chuntaojun
795005be2b fix: where config publish could not trigger horizontal notification in standalone + derby 2020-06-08 11:01:34 +08:00
杨翊 SionYang
ab22fc7f3b
Merge pull request #2976 from J-Cod3r/develop
[ISSUE #2956] simplify code
2020-06-08 09:52:27 +08:00
liaochuntao
99539dd330
Merge pull request #2986 from alibaba/hotfix_job_execute_condition
[#2985] fix task executable judgment logic problems
2020-06-08 00:55:10 +08:00
chuntaojun
71217154bb fix: fix task executable judgment logic problems 2020-06-07 20:34:11 +08:00
Brian Huang
0f1d0abcc1 hi.here 'addAll()' call can be replaced with parametrized constructor call,performance will be better 2020-06-07 19:55:21 +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
Brian Huang
6709b0686d
Merge pull request #1 from alibaba/develop
sync code
2020-06-07 18:47:55 +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
yangy
bf74511a82 simplify code 2020-06-07 10:06:00 +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
zongtanghu
8a2921e2cf [#1815]remove no used package name from Factory Class. 2020-06-04 09:21:44 +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
zongtanghu
15fad5d98a [#1815]remove destroyService from Factory Class. 2020-06-03 19:19:29 +08:00
chuntaojun
a212641730 fix: fix front-end Long precision loss problem 2020-06-03 19:12:13 +08:00
zongtanghu
860a2d02b1 resolve codes conflicts 2020-06-03 17:41:22 +08:00
zongtanghu
94c41e11d1 [#1815]fix unit test cases. 2020-06-03 17:35:49 +08:00
zongtanghu
09752e354d [#1815]adjust this keywords which just includes constructor and set method in the class and fix some unit test cases. 2020-06-03 17:35:06 +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