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 |
|
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 |
|
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 |
|
Fury Zhu
|
ed1da58434
|
Merge pull request #1268 from nkorange/hotfix_jackson_vulnerability
Hotfix jackson vulnerability
|
2019-05-27 17:23:31 +08:00 |
|
dupengcheng
|
c10165fd6e
|
Merge branch 'master' into master
|
2019-05-25 15:22:09 +08:00 |
|
Fury Zhu
|
d5b5dbb85e
|
Merge branch 'develop' into hotfix_jackson_vulnerability
|
2019-05-24 19:35:36 +08:00 |
|
xxc
|
54d58b9d1a
|
Merge pull request #1267 from nkorange/hotfix_jackson_vulnerability
Update jackson version
|
2019-05-24 17:51:36 +08:00 |
|
nkorange
|
9ccce18e16
|
Update jackson version
|
2019-05-24 17:23:51 +08:00 |
|
zhichen
|
e680f10ee8
|
fix #676
|
2019-05-24 15:47:59 +08:00 |
|
dupengcheng
|
67741c6712
|
fix: #1260
|
2019-05-24 13:18:47 +08:00 |
|
universefeeler
|
c15276cfcb
|
[ISSUE #876] feature(console):support console show cluster node state
|
2019-05-23 02:41:41 +08:00 |
|
yongchao9
|
b54838948e
|
issue#169 服务列表中增加示例代码查看功能
|
2019-05-20 22:13:42 +08:00 |
|
Fury Zhu
|
45f01772cb
|
Merge pull request #1221 from loadchange/issues-1007
Fix Issues #1007
|
2019-05-20 19:25:23 +08:00 |
|
Fury Zhu
|
dd029a913a
|
Merge pull request #1240 from nkorange/feature_enable_to_enabled
Fix #1007
|
2019-05-20 19:24:57 +08:00 |
|
Fury Zhu
|
29dc221ee0
|
Merge pull request #1243 from paderlol/master
Hotfix mysql8 not support system of windows #1185
|
2019-05-20 19:24:38 +08:00 |
|
pader.zhang
|
f8b758a6f2
|
Hotfix mysql8 not support system of windows #1185
|
2019-05-20 17:43:37 +08:00 |
|
pader
|
0b0e1e2aea
|
Merge pull request #11 from alibaba/master
pull latest code
|
2019-05-20 16:53:41 +08:00 |
|
Fury Zhu
|
63c98e1aad
|
Merge pull request #1241 from alibaba/hotfix_server_list_inconsistent
Fix #1091
|
2019-05-20 14:48:31 +08:00 |
|
Fury Zhu
|
bceba36372
|
Merge pull request #1238 from jifengnan/develop
[ISSUE #1227] DomainsManagerTest and RaftStoreTest Don't Work
|
2019-05-20 12:42:37 +08:00 |
|