Commit Graph

1454 Commits

Author SHA1 Message Date
chuntaojun
be3cb036a2 refactor(nacos-client:config): remove un use constructor 2019-06-11 10:01:55 +08:00
chuntaojun
dd9676c2e4 fix(nacos-client): fix merge conflict 2019-06-11 09:16:22 +08:00
chuntaojun
0e653a9b39 refactor(nacos-client:config): Modify the long poll timeout parameter to add Max retry custom Settin 2019-06-11 09:12:59 +08:00
Fury Zhu
ddfbf20163
Merge pull request #1345 from IanCao/master
format code
2019-06-10 16:57:38 +08:00
Fury Zhu
696312a33c
Merge pull request #1086 from jameslcj/feature/yaml
feature: add yaml validator #1084
2019-06-10 16:57:11 +08:00
zhichen
cdcbf10854 resolve conflict #1084 2019-06-10 16:45:20 +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
IanCao
1566cdcd95 formant code 2019-06-10 13:31:33 +08:00
universefeeler
5d9ae1541d chore(console): adjust console show details 2019-06-10 13:02:12 +08:00
IanCao
850223580a format code 2019-06-10 12:25:56 +08:00
IanCao
b989e50791 format code 2019-06-10 12:23:48 +08:00
Fury Zhu
0bb85896ac
Merge pull request #1245 from yongchao9/hotfix_169
[ISSUE #169] 服务列表中增加示例代码查看功能
2019-06-08 10:24:11 +08:00
chuntaojun
d43e079a97 test(nacos-test:config): add ConfigLongPoll_ITCase 2019-06-07 22:51:16 +08:00
chuntaojun
ecc015402e refactor(nacos-client): 修改与本pr无关的注释信息 2019-06-07 21:25:09 +08:00
chuntaojun
456e84785f refactor(nacos-client:config): Rewrite the HTTP retry rule 2019-06-07 18:41:08 +08:00
chuntaojun
92ff0a0873 fix(remove ConfigLongPollTest): 2019-06-07 16:58:29 +08:00
chuntaojun
be213f5601 test(nacos-client): add ConfigLongPollTest 2019-06-07 16:47:25 +08:00
yongchao9
748070cb71 #169 示例代码中的服务名与点击记录进行联动
Signed-off-by: yongchao9 <yuyongchao1986@163.com>
2019-06-07 11:56:41 +08:00
universefeeler
d08557a725 chore(clusterNode): adjust some code 2019-06-07 00:19:25 +08:00
chuntaojun
5623577a36 refactor(nacos-client): 修改config的LongPoll轮询的机制 2019-06-06 21:44:42 +08:00
chuntaojun
1f102f52f4 feat: 2019-06-06 20:38:24 +08:00
yongchao9
320a496625 同步develop分支pom配置
Signed-off-by: yongchao9 <yuyongchao1986@163.com>
2019-06-06 08:51:31 +08:00
yongchao9
224bc9c7cc 删除log文件
Signed-off-by: yongchao9 <yuyongchao1986@163.com>
2019-06-06 08:43:09 +08:00
chuntaojun
72a3a9b213 feat: 2019-06-05 22:31:09 +08:00
yongchao9
a9a809b214 清楚log文件
Signed-off-by: yongchao9 <yuyongchao1986@163.com>
2019-06-05 20:49:23 +08:00
yongchao9
0a58348438 Merge remote-tracking branch 'upstream/develop' into hotfix_169
合并远程develop分支
2019-06-05 20:43:20 +08:00
yongchao9
c1ac93aee8 同步远程develop分支 2019-06-05 20:43:12 +08:00
yongchao9
3c971e9c45 issue#169 服务列表中增加java示例代码查看功能 提交编译后文件
Signed-off-by: yongchao9 <yuyongchao1986@163.com>
2019-06-05 20:36:35 +08:00
Fury Zhu
78a4f0c3b5
Merge pull request #1335 from nkorange/hotfix_update_health_status_failed
Fix #1334
2019-06-05 20:33:38 +08:00
nkorange
6521aa3783 Fix #1334 2019-06-05 17:54:25 +08:00
Fury Zhu
d6d5ddfb4f
Merge pull request #1328 from nkorange/feature_heartbeat_log_level_debug
Fix #1215
2019-06-05 16:13:09 +08:00
universefeeler
4fe09db8ab fixed(naming): add licensed for ClusterStateView.java 2019-06-05 14:56:34 +08:00
universefeeler
c33b651e78 Merge branch 'master' of https://github.com/universefeeler/nacos 2019-06-05 14:33:32 +08:00
universefeeler
d0afee0e56 Merge remote-tracking branch 'upstream/develop' 2019-06-05 14:21:25 +08:00
chuntaojun
82961fe721 feat: 2019-06-05 13:35:01 +08:00
universefeeler
911985e5a0 Merge remote-tracking branch 'upstream/develop' 2019-06-05 11:43:13 +08:00
nkorange
3a1869bcd6 Fix #1215 2019-06-05 11:16:57 +08:00
nkorange
7a593ffaee Fix bug 2019-06-05 11:05:56 +08:00
universefeeler
ef8e1aac36 Merge remote-tracking branch 'upstream/develop' 2019-06-04 23:43:37 +08:00
Fury Zhu
9319b76d22
Merge pull request #1307 from pbting/namespace_unified
Namespace And Endpoint Support Multi Enviroment Switch
2019-06-04 17:15:26 +08:00
nkorange
138a15dcf3 Remove useless test 2019-06-04 16:53:17 +08:00
Fury Zhu
67ec4a4858
Merge pull request #1262 from dupengcheng/master
fix: #1260
2019-06-04 16:44:21 +08:00
pbting
3b869fcdbe change the comment from Chinese to English 2019-06-04 16:44:12 +08:00
Fury Zhu
3174aae243
Merge pull request #1290 from chuntaojun/develop
feat(client): @NacosConfigurationProperties support yaml style config
2019-06-04 16:29:53 +08:00
pbting
9d57976167 change the comment from Chinese to English 2019-06-04 16:21:21 +08:00
Fury Zhu
403e9b830a
Merge pull request #1303 from IanCao/master
close stream safety & format code
2019-06-04 16:12:03 +08:00
Fury Zhu
f2c061040c
Merge pull request #1309 from IanCao/fixbug2
FIX #1308
2019-06-04 16:09:30 +08:00