Commit Graph

1146 Commits

Author SHA1 Message Date
nkorange
3e43a5a090 Merge remote-tracking branch 'origin/feature_naming_group' into feature_naming_group 2019-03-11 17:33:08 +08:00
nkorange
5f07ce99e4 Fix #869 2019-03-11 17:32:52 +08:00
Keep
46eba2851b
Merge pull request #881 from hxy1991/fix_880
Fixes #880
2019-03-11 16:41:16 +08:00
hxy1991
a57529ad7e Fixes #880 2019-03-11 16:03:49 +08:00
xiaochun.xxc
ca4a303d08 add instance api 2019-03-11 15:45:39 +08:00
nkorange
b75ea9f333 Merge remote-tracking branch 'origin/feature_naming_group' into feature_naming_group 2019-03-08 17:18:13 +08:00
nkorange
8d28958cb7 #629 Fix bug 2019-03-08 17:18:01 +08:00
xiaochun.xxc
4a2e1be84a 增加接口用例 2019-03-08 16:52:08 +08:00
nkorange
6ae100e390 Fix http client error 2019-03-08 10:43:26 +08:00
nkorange
fb8cf7d3b6 Fix config name error 2019-03-08 10:24:46 +08:00
xiaochun.xxc
895431d8dc Merge branch 'feature_naming_group' of https://github.com/alibaba/nacos into feature_naming_group 2019-03-07 21:37:52 +08:00
xiaochun.xxc
a03d29a0c3 add cp mode testcases 2019-03-07 21:37:37 +08:00
nkorange
366d9f3c30 Fix merge conflict 2019-03-07 19:36:40 +08:00
nkorange
dae2809630 Merge branch 'develop' into feature_naming_group
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
#	client/src/main/java/com/alibaba/nacos/client/naming/utils/UtilAndComs.java
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	pom.xml
#	test/pom.xml
2019-03-07 19:24:22 +08:00
nkorange
4704200f87 #839 Rest of methods refactored. 2019-03-07 17:59:08 +08:00
Keep
d85f7c4f7e
Merge pull request #873 from hxy1991/fix_868
Fixes #868
2019-03-07 16:19:01 +08:00
nkorange
82ec466a8b #629 refactor warm up 2019-03-07 14:51:14 +08:00
hxy1991
2584e59edf Fixes #868 2019-03-07 14:46:34 +08:00
nkorange
bf2f6111d8 Fix #865 2019-03-06 20:57:10 +08:00
nkorange
dd0bd51617 Fix #866 2019-03-06 20:55:30 +08:00
nkorange
d741c02259 Merge remote-tracking branch 'origin/feature_naming_group' into feature_naming_group 2019-03-06 17:01:36 +08:00
nkorange
79f83f3a67 #502 Refactor warm up 2019-03-06 17:01:25 +08:00
xiaochun.xxc
5f41f0a53f 增加group用例 2019-03-06 16:24:39 +08:00
nkorange
d477bbce7c #502 validate instance format 2019-03-06 12:00:01 +08:00
nkorange
c4ad0888e0 #869 Clarify exception message 2019-03-06 11:59:15 +08:00
nkorange
160f4f840b #502 filter refactor 2019-03-05 21:17:36 +08:00
nkorange
344b97385b Merge remote-tracking branch 'origin/feature_naming_group' into feature_naming_group 2019-03-05 17:48:09 +08:00
nkorange
c9ab9e7904 #269 fix bug 2019-03-05 17:47:57 +08:00
xiaochun.xxc
f186219f7c fix bug“ 2019-03-05 17:38:49 +08:00
nkorange
349ea927c9 #502 fix bug 2019-03-05 17:05:24 +08:00
nkorange
a4155fd939 #269 fix test case bug 2019-03-05 15:58:51 +08:00
Fury Zhu
3ded5e3e8b
Merge pull request #864 from pbting/support_ans_developer
Code robustness to enhance the null value of properties
2019-03-05 15:47:48 +08:00
nkorange
42cd5395ac Merge remote-tracking branch 'origin/feature_naming_group' into feature_naming_group
# Conflicts:
#	test/src/test/java/com/alibaba/nacos/test/naming/AutoDeregisterInstance_ITCase.java
2019-03-05 14:55:26 +08:00
nkorange
7947fc29b1 #269 fix bug 2019-03-05 14:54:53 +08:00
得少
369f19608e #863 2019-03-05 13:07:23 +08:00
xiaochun.xxc
d067ab5b6b delete testcase info 2019-03-05 11:50:49 +08:00
xiaochun.xxc
8293662940 Merge branch 'feature_naming_group' of https://github.com/alibaba/nacos into feature_naming_group 2019-03-05 11:45:07 +08:00
xiaochun.xxc
8e6fb909d6 add group test 2019-03-05 11:44:54 +08:00
nkorange
116e9119c2 #269 fix send client beat bug 2019-03-05 11:35:58 +08:00
xiaochun.xxc
dd9866a049 add group testcase 2019-03-05 11:07:01 +08:00
nkorange
9cb683e15d #502 Fix filter bug 2019-03-05 10:41:04 +08:00
Fury Zhu
557464bd2c
Merge pull request #862 from pbting/support_ans_developer
Unified support from open source to commercialization parameters
2019-03-05 10:24:24 +08:00
得少
a9ff49692f Optimize code design 2019-03-05 10:08:28 +08:00
nkorange
f1732927ae #502 Add licence 2019-03-05 09:20:54 +08:00
得少
a05be5f97b log format 2019-03-04 19:23:11 +08:00
得少
0774cb23d4 format log 2019-03-04 19:15:04 +08:00
得少
1869bea58f format log 2019-03-04 18:50:35 +08:00
nkorange
8c23f34806 #269 fix bug 2019-03-04 17:12:29 +08:00
得少
df15d56018 constract error message will transfor to pararent construct 2019-03-04 17:09:09 +08:00
得少
43a51c0f25 #861 2019-03-04 16:56:01 +08:00