Commit Graph

1181 Commits

Author SHA1 Message Date
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
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
nkorange
3f2d704691 Fix #923 2019-03-18 20:03:08 +08:00
Fury Zhu
bd89a9c6e2
Merge pull request #922 from peachyy/master
Update RaftProxy.java
2019-03-18 17:29:23 +08:00
peachyy
c83fa78c17
Update RaftProxy.java
optimize imports
2019-03-18 17:13:09 +08:00
Keep
fe65c772cc
Merge pull request #921 from alibaba/feature_derby_size_fix
derby size 32KB limit fix
2019-03-18 16:11:03 +08:00
qingliang.ql
4cf86dfc66 fix derby size 大于32kb报错问题 2019-03-18 15:49:48 +08:00
xxc
24f6b20634
Merge pull request #899 from jameslcj/feature/issue803
Integrate UI test unit
2019-03-18 11:10:00 +08:00
nkorange
7ec7311fc7 Close #911 2019-03-18 10:36:54 +08:00
nkorange
a902194bc6 Close #910 2019-03-18 10:31:57 +08:00
nkorange
df7278a846 #502 Fix url too long problem. 2019-03-17 15:36:51 +08:00
Fury Zhu
0f78d7b7d4
Merge pull request #915 from alibaba/feature_naming_group
Feature naming group
2019-03-16 20:15:45 +08:00
Fury Zhu
c1d895acd2
Merge pull request #914 from alibaba/feature_naming_group
Feature naming group
2019-03-16 20:15:31 +08:00
nkorange
7ca6143550 #502 Fix concurrent problem. 2019-03-16 20:07:04 +08:00
nkorange
c9ed06107d Merge branch 'master' of https://github.com/alibaba/nacos 2019-03-16 12:29:48 +08:00
Fury Zhu
cb99ba334f
Merge pull request #913 from alibaba/1.0.0-RC1
Update CHANGELOG
2019-03-15 16:49:35 +08:00
nkorange
ee3f450f9d Merge branch '1.0.0-RC1'
# Conflicts:
#	CHANGELOG.md
2019-03-15 16:38:56 +08:00
nkorange
4de455ac0f Update CHANGELOG 2019-03-15 16:38:29 +08:00
nkorange
24183b2f43 Update CHANGELOG 2019-03-15 16:36:32 +08:00
nkorange
488075fa52 Update version to 1.0.0-RC1 2019-03-15 15:48:30 +08:00
nkorange
99513a2fe8 #502 Support NONE healthChecker deserialize 2019-03-15 15:36:17 +08:00