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 |
|
Nicholas2015
|
dc61375c29
|
common params to constant
|
2019-06-05 21:48:25 +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 |
|
Nicholas2015
|
bbb2108fd2
|
code format and some code detail
|
2019-06-04 17:10:27 +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 |
|
pbting
|
302ae79b3f
|
1. 注释改成中文
2. StringUtils 统一改成
3. 参数命名改为 nacos 前缀
|
2019-06-04 15:55:47 +08:00 |
|
Fury Zhu
|
c97e216158
|
Merge pull request #1320 from nkorange/feature_search_with_keyword_and_instances
Close #1319
|
2019-06-04 15:21:35 +08:00 |
|
nkorange
|
fbc72f0def
|
Close #1319
|
2019-06-04 15:03:05 +08:00 |
|
pbting
|
37b880b72a
|
remove the distributionManagement
|
2019-05-31 16:16:43 +08:00 |
|
IanCao
|
dd8ee44d65
|
fix
|
2019-05-31 16:14:58 +08:00 |
|
IanCao
|
5569e44361
|
fix
|
2019-05-31 15:43:34 +08:00 |
|
IanCao
|
40188f5eda
|
fix bug
|
2019-05-31 15:38:34 +08:00 |
|
IanCao
|
8acce1c5e2
|
format code
|
2019-05-31 15:28:34 +08:00 |
|
pbting
|
9963ca5f3f
|
change the version
|
2019-05-31 15:25:25 +08:00 |
|
pbting
|
c4be24a536
|
nacos client namespace support multi enviroment switch
|
2019-05-31 15:21:58 +08:00 |
|
IanCao
|
4b4c1b167e
|
fix
|
2019-05-31 14:29:51 +08:00 |
|
IanCao
|
4fdca26027
|
close stream safety
|
2019-05-31 14:26:54 +08:00 |
|
caoyixiong
|
67d2673c93
|
Merge pull request #1 from alibaba/master
merge
|
2019-05-31 11:31:51 +08:00 |
|
zhichen
|
554cfe3b53
|
Merge pull request #1264 from jameslcj/hotfix/676
modify the regular expression of properties validation
|
2019-05-30 20:03:30 +08:00 |
|
pbting
|
31292389ba
|
Merge branch 'develop' of https://github.com/alibaba/nacos into develop
|
2019-05-30 09:08:06 +08:00 |
|
Nicholas2015
|
20af90b821
|
add license
|
2019-05-29 22:54:35 +08:00 |
|
chuntaojun
|
97ff458422
|
feat(client): @NacosConfigurationProperties support yaml style config
|
2019-05-29 11:21:04 +08:00 |
|
yongchao9
|
1f9cda4918
|
Merge remote-tracking branch 'upstream/develop' into hotfix_169
# Conflicts:
# console/src/main/resources/static/css/main.css
# console/src/main/resources/static/js/main.js
|
2019-05-28 21:09:42 +08:00 |
|
yongchao9
|
25611359dc
|
issue#169 服务列表中增加示例代码查看功能 提交编译后文件
Signed-off-by: yongchao9 <yuyongchao1986@163.com>
|
2019-05-28 15:53:11 +08:00 |
|
keran
|
162f505fad
|
no message
|
2019-05-28 14:06:53 +08:00 |
|
keran
|
e0fb599303
|
no message
|
2019-05-28 13:15:01 +08:00 |
|