Commit Graph

1357 Commits

Author SHA1 Message Date
nkorange
12c032cb98 #502 Fix raft publish bug 2019-04-01 11:38:10 +08:00
hxy1991
df4f338a41 Fixes #984 2019-04-01 11:37:30 +08:00
nkorange
4dde5d6cfd Merge remote-tracking branch 'origin/feature_naming_group' into feature_naming_group 2019-04-01 11:34:40 +08:00
nkorange
2c7daa654e Fix #948 2019-04-01 11:34:28 +08:00
xiaochun.xxc
727768061d 适配测试用例 2019-04-01 11:01:00 +08:00
Fury Zhu
b1790fa09e
Merge pull request #975 from jifengnan/issue_974
[ISSUE #974] ArrayIndexOutOfBoundsException may be thrown when invokes taskDispatcher.addTask
2019-04-01 10:45:26 +08:00
Andy
180f3a73b2 Add unit test cases 2019-03-29 22:44:08 +08:00
Andy
1f125c4af3 Fix the issue: ArrayIndexOutOfBoundsException may be thrown when invokes taskDispatcher.addTask 2019-03-29 22:18:53 +08:00
xuechaos
9b7d61356a update versionUtils in stream close 2019-03-29 20:08:44 +08:00
nkorange
4c5b06c5bb Optimize code 2019-03-29 19:29:42 +08:00
nkorange
37b9004569 Fix #973 2019-03-29 19:27:30 +08:00
nkorange
bb27800bbd #502 Fix remove service failed bug 2019-03-27 20:53:01 +08:00
jifengnan
95009390e5
Merge pull request #5 from alibaba/master
sync the newest code
2019-03-27 19:13:21 +08:00
Keep
020350bd3f
Merge pull request #964 from yanlinly/master
support aliyun ecs role
2019-03-27 14:26:34 +08:00
water.lyl
d11fd7f73e support aliyun ram role 2019-03-27 14:13:15 +08:00
yanlinly
06df9ab738
Merge pull request #6 from alibaba/develop
merge nacos develop to yanlinly master
2019-03-27 10:10:38 +08:00
yanlinly
074d243f63
Merge branch 'master' into develop 2019-03-27 10:09:51 +08:00
nkorange
8ff3b60e52 Add User-Agent header in access log 2019-03-26 14:09:17 +08:00
nkorange
14ecd9c230 #502 Fix data inconsistent bug 2019-03-26 14:07:06 +08:00
nkorange
e2a720640a Fix #961 2019-03-26 11:55:48 +08:00
nkorange
a745423dec Merge branch 'develop' into feature_naming_group
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchDomain.java
#	pom.xml
#	test/pom.xml
2019-03-25 15:03:31 +08:00
Fury Zhu
cf8a3c73ab
Merge pull request #959 from alibaba/hotfix_client_beat
Hotfix client beat
2019-03-25 14:57:09 +08:00
Fury Zhu
9ec6fa1a7b
Merge pull request #958 from alibaba/hotfix_client_beat
Hotfix client beat
2019-03-25 14:42:36 +08:00
nkorange
de25dc844d Add namespace info in log 2019-03-25 14:16:29 +08:00
nkorange
e4579c9c0f #923 Add client beat method 2019-03-25 11:37:18 +08:00
Fury Zhu
a74f0011ac
Merge pull request #954 from alibaba/1.0.0-RC2
1.0.0 rc2
2019-03-22 20:52:58 +08:00
nkorange
d5dc3e5747 #502 Support delete service in AP mode 2019-03-22 20:42:00 +08:00
xuechaos
f0431913c0 Merge branch 'develop' of https://github.com/alibaba/nacos into develop 2019-03-22 18:21:40 +08:00
xuechaos
1e87e54bf0 close#874 process nacos.nacos is id for start or stop 2019-03-22 18:20:25 +08:00
nkorange
dc51aa5703 Merge branch 'hotfix_server_mode' into develop 2019-03-22 17:31:36 +08:00
nkorange
fcf968c36b Update version to 1.0.0-RC2 2019-03-22 17:29:26 +08:00
Fury Zhu
cb5eb8afe3
Merge pull request #953 from alibaba/hotfix_server_mode
Hotfix server mode
2019-03-22 17:16:59 +08:00
nkorange
18b6523b62 Fix #923 2019-03-22 17:04:07 +08:00
nkorange
da757f156c Fix #938 2019-03-22 16:58:46 +08:00
Fury Zhu
7ce768161b
Merge pull request #951 from loadchange/hotfix_service_api
Fix: delete service add group name
2019-03-22 16:37:32 +08:00
LoadChange
8ff2ced3be fix: delete service add group name 2019-03-22 15:01:58 +08:00
nkorange
9b24b46f7a Fix #946 2019-03-22 12:39:30 +08:00
xxc
8ea7a81bdc
Update README.md
update LOGO using Nacos
2019-03-22 00:47:12 +08:00
xxc
9895848050
Update README.md
update LOGO using Nacos
2019-03-22 00:45:10 +08:00
xxc
9af8e0e847
Update README.md
add LOGO using Nacos
2019-03-22 00:37:14 +08:00
xxc
bf162f730e
Merge pull request #935 from loadchange/optimize
Fix: Console default home page
2019-03-21 14:13:48 +08:00
Fury Zhu
78466d4e48
Merge pull request #937 from alibaba/hotfix_default_server_mode
#745 Modify default server mode
2019-03-21 09:33:32 +08:00
Fury Zhu
cde0928ec8
Merge branch 'master' into hotfix_default_server_mode 2019-03-21 09:12:00 +08:00
nkorange
81bbbe6e56 #745 Modify default server mode 2019-03-21 09:04:19 +08:00
nkorange
7303ea7b66 #745 Remove server mode 2019-03-20 18:08:36 +08:00
LoadChange
320d694913 fix: function Mode default home page 2019-03-20 17:19:15 +08:00
TsingLiang
33187e18de
Merge pull request #926 from hxy1991/fix_925
Fixes #925
2019-03-19 14:57:09 +08:00
hxy1991
dcaca7e9a2 Fixes #925 2019-03-19 14:36:57 +08:00
nkorange
f6ea5042c8 #502 Refactor 2019-03-19 11:03:31 +08:00
nkorange
52d4e01bc7 #502 Fix several bugs 2019-03-18 20:57:28 +08:00