Commit Graph

298 Commits

Author SHA1 Message Date
nkorange
6466218baf Raft performance improved. 2018-10-29 20:34:12 +08:00
nkorange
abdc48fc84 Fix register instance with customized cluster name failed bug. 2018-10-25 15:56:02 +08:00
nkorange
855037cac6 Fix client side health check error 2018-10-25 13:22:22 +08:00
wyp12
1cf0a5b731 Merge remote-tracking branch 'origin/hotfix-clientbeat-failed' into feature_ServiceMesh 2018-10-24 18:00:02 +08:00
nkorange
f4e8684fdf Fix #149 2018-10-24 17:54:34 +08:00
nkorange
e3276d0114 Fix #150 2018-10-24 17:52:55 +08:00
wyp12
4da7557620 add enable 2018-10-24 11:17:47 +08:00
wyp12
5cc9137d66 update 2018-10-23 14:56:26 +08:00
water.lyl
2e36f7f397 [motify info] release ui file 2018-10-20 08:30:53 +08:00
xuechaos
1fbcf24521 update 0.3.0-RC1 uppercase letter 2018-10-19 18:36:29 +08:00
xxc
b87efc470e
Merge pull request #140 from alibaba/0.3.0
0.3.0
2018-10-19 17:24:29 +08:00
nkorange
c63f5899f6 Fix #139 2018-10-19 16:55:44 +08:00
Keep
b09179bed2
Merge pull request #137 from hxy1991/master
update pom.xml for release client jar
2018-10-19 16:11:41 +08:00
xxc
994a508a91
notifications add mw_configcenter
- mw_configcenter@list.alibaba-inc.com
2018-10-19 16:09:21 +08:00
hxy1991
43452229bf update pom.xml for release client jar 2018-10-19 15:41:47 +08:00
小马哥
72cec826cb
Merge pull request #136 from mercyblitz/0.3.0
Fixed test cases
2018-10-19 11:33:47 +08:00
mercyblitz
66a3930a4d Fixed test cases 2018-10-19 11:32:09 +08:00
小马哥
a41c173275
Merge pull request #135 from mercyblitz/0.3.0
Add Default properties
2018-10-19 11:22:54 +08:00
mercyblitz
a826288f9c Add server.servlet.contextPath=/nacos 2018-10-19 11:18:17 +08:00
mercyblitz
cc616f8d6d Revert Constants.java & testcase 2018-10-19 11:00:37 +08:00
小马哥
b64a0ba9c0
Merge pull request #134 from mercyblitz/0.3.0
0.3.0
2018-10-19 10:53:31 +08:00
mercyblitz
69c3989a17 Update logging levels 2018-10-19 10:50:35 +08:00
mercyblitz
02cf0832c6 Sync upstream/0.3.0 2018-10-19 10:48:30 +08:00
mercyblitz
d9196fd7fe Sync upstream/0.3.0 2018-10-19 10:48:15 +08:00
nkorange
fa163631a1 Update version to 0.3.0-rc1 2018-10-18 23:06:42 +08:00
nkorange
6da8bf89fc Resolve conflicts and fix log error 2018-10-18 22:23:26 +08:00
nkorange
faae4161a6 Merge remote-tracking branch 'origin/0.3.0' into 0.3.0 2018-10-18 19:01:16 +08:00
nkorange
534995a405 Resolve conflicts 2018-10-18 18:59:45 +08:00
zhichen
1fdd763b8d fix pageSize bug 2018-10-18 17:16:32 +08:00
nkorange
baa8594fe7 Merge branch 'master' into 0.3.0
# Conflicts:
#	api/pom.xml
#	config/pom.xml
#	config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
#	console/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	naming/src/main/resources/application.properties
2018-10-18 17:11:32 +08:00
王彦民
4ae610d2cc Merge branch '0.3.0' of github.com:alibaba/nacos into 0.3.0 2018-10-18 14:27:30 +08:00
王彦民
cc4dc419f6 fix: Service Detail i18n 2018-10-18 14:26:53 +08:00
王彦民
1441561ae3 fix: Service Detail i18n 2018-10-18 14:26:05 +08:00
zhichen
5430de8565 Merge branch '0.3.0' of https://github.com/alibaba/nacos into 0.3.0 2018-10-18 14:10:25 +08:00
zhichen
9d6e57af5c fix ConfigEditor bugs 2018-10-18 14:10:18 +08:00
water.lyl
d4a5fb2bd1 [motify info] fix dataId cannot show problem 2018-10-18 12:46:56 +08:00
wyp12
503fb213ef Merge remote-tracking branch 'origin/0.3.0' into feature_ServiceMesh 2018-10-18 10:39:56 +08:00
nkorange
96abf18b41 Fix health check disabled bug 2018-10-18 10:28:50 +08:00
Fury Zhu
1571945446
Merge pull request #127 from aCoder2013/fix-serverlist-check
Fix potential NPE
2018-10-18 10:00:24 +08:00
nkorange
0c034d5ee3 Fix health check is disabled bug 2018-10-17 20:26:15 +08:00
wyp12
a84fe24780 Merge remote-tracking branch 'origin/0.3.0' into feature_ServiceMesh 2018-10-17 19:59:40 +08:00
nkorange
f1b3e7d82d Optimize log display 2018-10-17 19:49:01 +08:00
wyp12
27d797ae60 Merge remote-tracking branch 'origin/0.3.0' into feature_ServiceMesh 2018-10-17 19:46:12 +08:00
wyp12
251b2f01d8 merge master 2018-10-17 19:45:35 +08:00
nkorange
698cf480e0 Fix #130 2018-10-17 18:12:39 +08:00
小马哥
ab23965474
Merge pull request #129 from mercyblitz/master
Fixed test cases
2018-10-17 16:40:28 +08:00
mercyblitz
8f7c743a00 Fixed test cases 2018-10-17 16:39:12 +08:00
nkorange
5374e89417 Merge remote-tracking branch 'origin/0.3.0' into 0.3.0 2018-10-17 16:21:43 +08:00
nkorange
504edb141b Add metadata test case 2018-10-17 16:21:33 +08:00
zhichen
dd4e87f35a Merge branch '0.3.0' of https://github.com/alibaba/nacos into 0.3.0 2018-10-17 15:13:11 +08:00