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 |
|
nkorange
|
3148ba0e91
|
Fix #1007
|
2019-05-20 12:39:43 +08:00 |
|
Fury Zhu
|
35e452e049
|
Merge pull request #1225 from rushsky518/master
Windows script cannot specify FUNCTION_MODE #1148
|
2019-05-20 12:18:25 +08:00 |
|
Andy
|
22310d0f18
|
Correct some unit test cases
|
2019-05-18 21:14:20 +08:00 |
|
Fury Zhu
|
5cab208cbd
|
Merge pull request #1228 from sheiy/master
Update pom.xml
|
2019-05-17 19:24:52 +08:00 |
|
Fury Zhu
|
9ee2d113c0
|
Merge pull request #1233 from jifengnan/develop
[ISSUE #1107] Quick fixing for the cluster deserialization issue
|
2019-05-17 10:04:03 +08:00 |
|
Andy
|
2bb33878b9
|
Quick fixing for the cluster deserialization issue
|
2019-05-16 21:41:09 +08:00 |
|
Fury Zhu
|
9ca656015f
|
Merge pull request #1232 from chuntaojun/develop
update MaintainService_ITCase
|
2019-05-16 19:21:03 +08:00 |
|
chuntaojun
|
f21db94327
|
fix(test):
|
2019-05-16 16:57:02 +08:00 |
|
chuntaojun
|
51ded2c857
|
fix(fix NamingMaintainService_ITCase mistake):
|
2019-05-16 12:25:00 +08:00 |
|
chuntaojun
|
4c5c2a66e8
|
fix(test): fix NamingMaintainService_ITCase mistake
|
2019-05-16 12:08:28 +08:00 |
|
sheiy
|
229262f5a1
|
Update pom.xml
java.util.Objects 至少需要jdk7
|
2019-05-15 23:06:46 +08:00 |
|
rushsky518
|
6a7a991e69
|
Merge branch 'master' of https://github.com/rushsky518/nacos
|
2019-05-15 16:24:21 +08:00 |
|
rushsky518
|
9aea3ff2c4
|
windows 脚本支持 -m -f 参数
|
2019-05-15 16:23:57 +08:00 |
|
得少
|
26f2759184
|
syncing upstream develop code
merge branch 'develop' of https://github.com/alibaba/nacos into develop
|
2019-05-14 17:15:15 +08:00 |
|
xxc
|
822e975fb2
|
Update README.md
add Nepxion LOGO
|
2019-05-14 17:07:05 +08:00 |
|
LoadChange
|
7c1afc30c8
|
fix: closes #1007
|
2019-05-14 15:18:29 +08:00 |
|
Asa
|
86397593c4
|
Merge pull request #1201 from justlive1/master
修复服务详情页面集群列表获取只获取groupName=DEFAULT_GROUP的数据
|
2019-05-14 11:31:58 +08:00 |
|
Fury Zhu
|
80dd3bd104
|
Merge pull request #1212 from chuntaojun/develop
refactor(client): delete useless test case
|
2019-05-14 11:20:50 +08:00 |
|
justlive1
|
fd327268fe
|
build
|
2019-05-13 17:48:57 +08:00 |
|
justlive1
|
11304ff0b6
|
Merge branch 'develop' of https://github.com/alibaba/nacos
# Conflicts:
# console/src/main/resources/static/css/main.css
# console/src/main/resources/static/js/main.js
|
2019-05-13 17:33:32 +08:00 |
|
chuntaojun
|
01b74be838
|
refactor(client): delete useless test case
|
2019-05-13 11:19:52 +08:00 |
|
Fury Zhu
|
1f1b047984
|
Merge pull request #1126 from XCXCXCXCX/ISSUE_#359
[#359] provide a way for user to implement their health checkers.
|
2019-05-12 11:04:14 +08:00 |
|
XCXCXCXCX
|
23454ffd84
|
fix something
|
2019-05-12 10:32:09 +08:00 |
|
Fury Zhu
|
a3da3136f6
|
Merge pull request #1161 from rushsky518/master
[ISSUE #1118] 历史配置文件保留天数，可配置
|
2019-05-12 00:12:31 +08:00 |
|
rushsky518
|
f1fd3bbb64
|
Update DumpService.java
property with prefix nacos.config
|
2019-05-10 17:31:55 +08:00 |
|
XCXCXCXCX
|
6dc3882eef
|
fix something
|
2019-05-10 13:47:22 +08:00 |
|
justlive1
|
54e2afb7f9
|
修复服务分组为非DEFAULT_GROUP，服务详情集群列表获取为DEFAULT_GROUP
|
2019-05-09 16:27:04 +08:00 |
|
XCXCXCXCX
|
c137994384
|
fix pmd
|
2019-05-09 11:31:03 +08:00 |
|