Commit Graph

1738 Commits

Author SHA1 Message Date
Fury Zhu
2be84834e9
Merge pull request #1633 from zhaoyuguang/fix-ci
FIX CI UN Build
2019-08-01 15:22:31 +08:00
赵禹光
50fb50e6a1 no message 2019-08-01 12:33:29 +08:00
Fury Zhu
838ef83f9f
Merge pull request #1534 from zhaoyuguang/zen3
format code
2019-08-01 11:04:24 +08:00
Fury Zhu
9b2367eb91
Merge pull request #1552 from nkorange/hotfix_log_optimization
Fix #290
2019-08-01 11:02:55 +08:00
Fury Zhu
0a08be2b96
Merge pull request #1630 from alibaba/feature_enhance_interface
upgrade fastjson version and Optimizing Some interfaces
2019-08-01 11:00:55 +08:00
yanlinly
ebca6772bd
Merge pull request #1547 from wfnuser/develop
feat: support update password api
2019-08-01 10:31:36 +08:00
pbting
3d1cf6e092 Merge branch 'upstream_develop' into feature_enhance_interface 2019-07-31 16:25:56 +08:00
Fury Zhu
32c2914959
Merge pull request #1544 from zhaoyuguang/z_wcek_1479
Fix1479
2019-07-31 10:50:43 +08:00
Fury Zhu
b0dd759a85
Merge pull request #1511 from KeRan213539/multipleSelectionDeletion
Multiple selection deletion
2019-07-30 17:11:40 +08:00
Fury Zhu
302de9c885
Merge pull request #1578 from loadchange/issues/1569
Fix: closes #1569
2019-07-30 16:47:45 +08:00
Fury Zhu
e5df89fde1
Merge pull request #1623 from nkorange/feature_forbid_invalid_namespace
Fix namespace vulnerability
2019-07-30 16:36:36 +08:00
Fury Zhu
1c68568f4d
Merge pull request #1587 from rushsky518/develop
distro use local time to record heartbeat
2019-07-30 16:35:16 +08:00
Fury Zhu
dea95fa11a
Merge pull request #1525 from ly641921791/develop
Fix #1519 The subscriber list is not displayed correctly
2019-07-30 15:36:59 +08:00
赵禹光
61ae002cea no message 2019-07-30 15:06:04 +08:00
赵禹光
224f2237e6 Merge commit 'ad5c249e7c852daf4e2f7b09b9c12c432d5b3cf7' into z_wcek_1479
# Conflicts:
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
2019-07-30 15:04:42 +08:00
Fury Zhu
ad5c249e7c
Merge pull request #1499 from chuntaojun/fix_issue_1492
feat(config): support different db name and password
2019-07-30 14:52:29 +08:00
Fury Zhu
364fa7ec02
Merge pull request #1501 from chuntaojun/fix_issue_1500
fix(api): fix issue #1500
2019-07-30 14:40:13 +08:00
nkorange
207e54631c Fix namespace vulnerability 2019-07-30 00:40:21 +08:00
Fury Zhu
0bd1f12f86
Merge pull request #1592 from nkorange/hotfix_data_listener_lost
Fix #1591
2019-07-29 21:54:59 +08:00
pbting
e45546bc66 upgrade the fastjson version 2019-07-29 09:30:02 +08:00
wfnuser
486ef1e6f2 feat: support change password 2019-07-28 15:20:29 +08:00
nkorange
e5d0d66492 Fix #1591 2019-07-26 17:10:02 +08:00
nkorange
8d453e62a8 Fix #1591 2019-07-23 16:36:55 +08:00
rushsky518
e259dc34e8 #1529
distro 使用本地时间记录心跳
2019-07-22 19:24:46 +08:00
LoadChange
ba1e6a2333 fix: closes #1569 2019-07-20 18:40:26 +08:00
LoadChange
d1127041cf fix: closes #1520 2019-07-20 18:09:04 +08:00
pbting
2e2f480c06 add method for ServiceManager with putServiceIfAbsent 2019-07-18 16:28:12 +08:00
pbting
fbf9d43698 Merge branch 'develop' of https://github.com/alibaba/nacos into feature_enhance_interface 2019-07-18 15:01:40 +08:00
pbting
13784d6217 support when instance heartbeat timeout will publish an event 2019-07-18 15:00:30 +08:00
nkorange
1711c3765f Fix #290 2019-07-15 15:47:02 +08:00
wfnuser
c5aec4c227 feat: support update password api 2019-07-14 22:28:34 +08:00
LoadChange
5d019cb55e fix: closes #1521 2019-07-14 17:00:53 +08:00
赵禹光
511e134ec5 fix1479 2019-07-13 12:43:01 +08:00
pbting
d5bd6b4927 enhance serviceManager#removeInstance interface 2019-07-12 17:20:39 +08:00
xxc
06304f583c
update demo case NacosREADME.md 2019-07-12 16:25:24 +08:00
Fury Zhu
4918fe8056
Merge pull request #1523 from alibaba/feature_service_change_event
support ServiceChangeEvent with naming module
2019-07-12 16:15:03 +08:00
赵禹光
8320701f2e fmt 2019-07-11 20:27:59 +08:00
赵禹光
ea974dc282 fmt 2019-07-11 20:25:08 +08:00
赵禹光
fb5a352ec6 fmt 2019-07-11 20:24:13 +08:00
赵禹光
1042831c2a fmt 2019-07-11 20:22:31 +08:00
赵禹光
60ae75f870 fmt 2019-07-11 20:21:10 +08:00
赵禹光
ce1ebeb85c fmt 2019-07-11 20:20:21 +08:00
赵禹光
b7b18faeea OperationController.java useless import 2019-07-11 20:19:53 +08:00
赵禹光
4d771b340e fmt AppTest 2019-07-11 20:19:24 +08:00
赵禹光
a265196a89 NacosNamingService.java useless import 2019-07-11 20:18:50 +08:00
赵禹光
ff804eb340 ClientBeatCheckTask.java useless import 2019-07-11 20:14:04 +08:00
ly
a87f0bd2bb Fix #1519 The subscriber list is not displayed correctly 2019-07-11 01:48:11 +08:00
ly
a7e61dff8b Fix #1519 The subscriber list is not displayed correctly 2019-07-10 20:33:39 +08:00
得少
14ac4ac1d1 support ServiceChangeEvent 2019-07-10 17:49:34 +08:00
nkorange
1915e9c087 Fix NPE 2019-07-09 18:59:52 +08:00