Commit Graph

458 Commits

Author SHA1 Message Date
得少
48918cbbc7 change the design for nacos address 2019-07-04 21:50:43 +08:00
得少
7f97289340 Merge branch 'develop' into feature_address_server 2019-07-04 15:07:03 +08:00
nkorange
49027b892d Update version to 1.1.0-SNAPSHOT 2019-07-04 15:01:49 +08:00
得少
7336a8b7f5 fix #1458
support address server mode ,so nacos client will use the endpoint to initializer
2019-07-01 23:08:08 +08:00
Fury Zhu
819d5d1db5
Merge pull request #1404 from slievrly/charset
optimize charset、continue and return
2019-07-01 13:12:03 +08:00
Fury Zhu
defe701737
Merge pull request #1446 from Nicholas2015/hotfix_subscriber_array_494
Collective data de-duplication
2019-06-30 22:35:36 +08:00
Nicholas2015
71ee840111 Collective data de-duplication 2019-06-29 12:59:35 +08:00
nkorange
3a8575e22f Update version to 1.0.2-SNAPSHOT 2019-06-28 17:34:59 +08:00
nkorange
4605733595 Update version to 1.0.2 2019-06-28 17:18:59 +08:00
Fury Zhu
fac3dc8a23
Merge branch 'develop' into charset 2019-06-27 18:50:57 +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
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
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
1decd04008 #1278 2019-06-21 11:41:55 +08:00
IanCao
490f194b82 server update client interval 2019-06-20 17:53:28 +08:00
Fury Zhu
490e93ddcf
Merge pull request #1402 from slievrly/optimize
remove unused import
2019-06-20 13:58:50 +08:00
slievrly
e01a44702b optimize charset、continue and return
Signed-off-by: slievrly <slievrly@163.com>
2019-06-19 23:47:55 +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
nkorange
b52ba3ed91 Fix #1397 2019-06-19 17:57:26 +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
IanCao
e6631316b4 add ClientBeatCheckTaskTest junit test 2019-06-18 17:32:14 +08:00
Fury Zhu
d5e8ef5063
Merge branch 'develop' into study 2019-06-18 10:47:21 +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
赵禹光
10aa620315 All overriding methods must be preceded by @Override annotations. 2019-06-14 18:54:04 +08:00
caoyixiong
4f56452999
Merge pull request #3 from alibaba/master
merge
2019-06-14 05:35:19 -05:00
IanCao
838eb60cc5 add testcase 2019-06-14 17:46:42 +08:00
IanCao
581e732305 Just return empty instance list if service not found #1367 2019-06-14 17:40:33 +08:00
Nicholas2015
13331c50d1 add assert 2019-06-13 22:41:54 +08:00
IanCao
a98db447fe format code 2019-06-13 12:26:22 +08:00
caoyixiong
dbbb456e87
Merge pull request #2 from alibaba/master
merge
2019-06-12 21:00:53 -05:00
IanCao
266f81a01e format code 2019-06-13 09:57:11 +08:00
nkorange
a60bed8dee Update version to 1.0.1 2019-06-12 16:28:12 +08:00
nkorange
a7f3cabf3c Update version to 1.0.1-SNAPSHOT 2019-06-11 17:04:36 +08:00
IanCao
ba7cbf1a7f FIX BUG 2019-06-11 16:34:34 +08:00
IanCao
63560370ae Different instance has different TTL. 2019-06-11 14:40:28 +08:00
Fury Zhu
4ad21f2dae
Merge branch 'develop' into master 2019-06-10 16:24:16 +08:00
Fury Zhu
555e323302
Merge pull request #1258 from universefeeler/master
[ISSUE #876] feature(console):support console show cluster node state
2019-06-10 16:16:36 +08:00
IanCao
574a47ca6d remove useless code 2019-06-10 16:05:52 +08:00
IanCao
eee5b34d39 format code 2019-06-10 15:38:58 +08:00
Nicholas2015
6be91e9b45 add assert 2019-06-09 21:33:56 +08:00
Nicholas2015
e1c1b32ae7 add assert 2019-06-09 20:27:16 +08:00
Nicholas2015
7d52d47f74 add test case 2019-06-08 20:52:10 +08:00
universefeeler
d08557a725 chore(clusterNode): adjust some code 2019-06-07 00:19:25 +08:00
Nicholas2015
dc61375c29 common params to constant 2019-06-05 21:48:25 +08:00