Commit Graph

1545 Commits

Author SHA1 Message Date
caoyixiong
34025a5132 format code 2019-06-26 12:07:33 +08:00
caoyixiong
781273faa6
Merge pull request #5 from alibaba/develop
merge
2019-06-25 21:47:24 -05:00
caoyixiong
56be528ce4 format code and remove useless 2019-06-25 17:36:43 +08:00
Fury Zhu
57b0fe3b52
Merge pull request #1414 from IanCao/fix11
【issue】#1278
2019-06-24 14:21:22 +08:00
caoyixiong
6d6e4a184c format 2019-06-24 14:00:49 +08:00
caoyixiong
2ca8e0c1b3 fix 2019-06-24 13:57:51 +08:00
caoyixiong
4c87550750 update nacosException 2019-06-24 13:55:50 +08:00
caoyixiong
09f5b84138
Merge pull request #4 from alibaba/develop
merge
2019-06-23 23:29:32 -05:00
Fury Zhu
c7fe374af6
Merge pull request #1413 from chuntaojun/develop
feat(nacos-api): add enableRemoteSyncConfig properties setting
2019-06-24 10:24:58 +08:00
Fury Zhu
94f034bccf
Merge pull request #1407 from slievrly/junit
optimize junit
2019-06-24 10:23:47 +08:00
Fury Zhu
1898bcfb89
Merge pull request #1403 from slievrly/modifier
optimize modifier access
2019-06-24 10:17:39 +08:00
Fury Zhu
042b7a2268
Merge pull request #1353 from IanCao/master
TTL and client beat interval should be customized at instance level.
2019-06-24 10:16:12 +08:00
Fury Zhu
c242c920b7
Merge pull request #1422 from Nicholas2015/hotfix_subscriber_494
add page info to subscriber service
2019-06-24 10:14:48 +08:00
LoadChange
9381a10d1f refactor: closes #1354 2019-06-23 21:55:11 +08:00
Fury Zhu
0867117e3f
Merge branch 'develop' into master 2019-06-23 06:50:16 +08:00
Nicholas2015
dbf6d45bf4 add page info 2019-06-22 13:31:00 +08:00
caoyixiong
5c108ea0c4 fix 2019-06-22 10:40:53 +08:00
caoyixiong
1decd04008 #1278 2019-06-21 11:41:55 +08:00
caoyixiong
b2242194f4 fix 2019-06-20 23:11:02 +08:00
caoyixiong
887d3b6c63
Update BeatReactorTest.java 2019-06-20 20:17:06 +08:00
caoyixiong
5ad978b663 add BeatReactorTest 2019-06-20 19:53:17 +08:00
IanCao
490f194b82 server update client interval 2019-06-20 17:53:28 +08:00
chuntaojun
090b047d4b feat(nacos-api): add enableRemoteSyncConfig properties setting 2019-06-20 14:52:07 +08:00
slievrly
15ad43b924 optimize junit
Signed-off-by: slievrly <slievrly@163.com>
2019-06-20 14:40:57 +08:00
Fury Zhu
490e93ddcf
Merge pull request #1402 from slievrly/optimize
remove unused import
2019-06-20 13:58:50 +08:00
Fury Zhu
409838fe1f
Merge pull request #1398 from nkorange/hotfix_notify_task_called_before_data_loaded
Fix #1397
2019-06-20 10:31:32 +08:00
slievrly
21bf279532 optimize modifier access
Signed-off-by: slievrly <slievrly@163.com>
2019-06-19 23:12:43 +08:00
slievrly
443679c1c8 remove unused import 2019-06-19 22:52:31 +08:00
IanCao
7b839d0f83 fix bug 2019-06-19 19:46:40 +08:00
nkorange
b52ba3ed91 Fix #1397 2019-06-19 17:57:26 +08:00
IanCao
16f8a16cb3 fix bug 2019-06-19 17:13:35 +08:00
IanCao
5757881c0e update 2019-06-19 16:59:28 +08:00
IanCao
f2d22f181a fix 2019-06-19 16:58:27 +08:00
Fury Zhu
cca2ca9752
Merge pull request #1373 from IanCao/fix11
Just return empty instance list if service not found #1367
2019-06-19 15:34:17 +08:00
Fury Zhu
bfd06c8e52
Merge pull request #1395 from loadchange/issues/1352
Issues #1352
2019-06-19 15:33:25 +08:00
Fury Zhu
627e5cf460
Merge pull request #1376 from chuntaojun/develop
Support more config type setting and fix travis-ci yaml bug
2019-06-19 15:15:25 +08:00
LoadChange
fcda55b95e refactor: closes #1352 2019-06-19 12:08:36 +08:00
chuntaojun
c91f99b82e fix(nacos-client:config): Fix code conflicts 2019-06-18 23:27:28 +08:00
IanCao
d7908c651d change into 2 threadpool(mainloop & taskThreadpool) 2019-06-18 17:49:44 +08:00
IanCao
e6631316b4 add ClientBeatCheckTaskTest junit test 2019-06-18 17:32:14 +08:00
Fury Zhu
d5873a21e4
Merge pull request #1374 from zhaoyuguang/study
All overriding methods must be preceded by @Override annotations.
2019-06-18 11:33:02 +08:00
Fury Zhu
d5e8ef5063
Merge branch 'develop' into study 2019-06-18 10:47:21 +08:00
Fury Zhu
b29e4c8e3f
Merge pull request #1380 from chuntaojun/fix_issue_1317
Fix issue 1317
2019-06-18 10:12:32 +08:00
chuntaojun
2a67382a7a refactor(nacos-client:config): Modify exception handling 2019-06-17 21:11:25 +08:00
chuntaojun
44e3c5e224 refactor(nacos-api:config): Modify ConfigYype to be an enumeration class 2019-06-17 18:31:50 +08:00
IanCao
d0bf21a756 fix bug 2019-06-17 18:28:03 +08:00
IanCao
6b4a9b72a5 fix bug 2019-06-17 18:07:54 +08:00
Fury Zhu
5fba6242ef
Merge pull request #1297 from Nicholas2015/feature_get_subscribers
Feature get subscribers
2019-06-17 17:24:47 +08:00
Fury Zhu
c691739300
Merge pull request #1365 from IanCao/dev_cyx
format code and remove useless code
2019-06-17 16:58:01 +08:00
Fury Zhu
3c28f76156
Merge pull request #1375 from zhaoyuguang/study2
Use static methods maybe better
2019-06-17 16:53:51 +08:00