Commit Graph

88 Commits

Author SHA1 Message Date
nkorange
592f2b4301 #502 Add NONE healthChecker 2019-03-15 15:08:01 +08:00
nkorange
6034bdbdb9 #502 Compatible with 0.8.0 2019-03-14 16:04:07 +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
82ec466a8b #629 refactor warm up 2019-03-07 14:51:14 +08:00
nkorange
c4ad0888e0 #869 Clarify exception message 2019-03-06 11:59:15 +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
pbting
e916431d65
Update SystemPropertyKeyConst.java 2019-02-22 17:43:28 +08:00
得少
b3ee9698fa #817 2019-02-22 17:06:02 +08:00
nkorange
59c2765ada Fix #809 2019-02-22 12:25:05 +08:00
nkorange
7af1b480b8 #269 Support service group 2019-02-18 16:04:55 +08:00
nkorange
9409ebfd8b Merge branch 'feature_naming_ap' into feature_naming_group
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
2019-02-18 08:49:41 +08:00
pbting
5e78e9a315
Merge branch 'feature_support_ans' into 0.8.0-poc-support-ans 2019-02-15 11:08:03 +08:00
nkorange
dd9db82b7b Merge develop 2019-02-14 19:33:33 +08:00
pbting
15e0f30849 fix #367 2019-02-14 18:00:01 +08:00
pbting
e9bbe492bb code format with idea 2019-02-13 16:12:16 +08:00
nkorange
9783240e9d #269 Support service group 2019-02-13 15:46:28 +08:00
pbting
1a6fa9e69c support ans 2019-02-13 15:42:41 +08:00
nkorange
194387b583 #745 Support multiple server modes 2019-02-11 14:59:12 +08:00
nkorange
58b8d1640f #744 Add server status, #629 Add partition service warm up logic 2019-02-09 15:43:03 +08:00
nkorange
cba85f0635 #502 Fix licence problem 2019-02-02 15:14:16 +08:00
nkorange
ab562117d5 #502 Fix HTTP 302 use GET problem. 2019-02-01 19:59:41 +08:00
nkorange
d3a4834672 #650 Server list manager detects healthy servers 2019-01-30 10:06:37 +08:00
nkorange
caf7213c2d #502 Fix serialize problem and do some refactoring for health check 2019-01-27 22:50:41 +08:00
nkorange
0e0900bfa9 #677 Add ephemeral instance implementation 2019-01-24 16:56:51 +08:00
nkorange
6ebde678d3 #502 Reorganize parameter mapping. 2019-01-23 15:33:20 +08:00
nkorange
f2b43fb240 #502 Update author information 2019-01-19 21:23:35 +08:00
wuyoushan
938666c7b8 remove useless semicolon 2019-01-17 18:02:44 +08:00
nkorange
fdc48028fc Merge branch 'feature_subscription_by_query_optional' into feature_multi_tenant
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
2019-01-14 16:01:14 +08:00
Fury Zhu
15aec2aa61
Merge branch 'develop' into feature_subscription_by_query_optional 2019-01-14 14:28:53 +08:00
Keep
21b7f96809
Merge pull request #446 from lostcharlie/develop
[ISSUE #442] Fix typos in class names and variables.
2019-01-11 14:19:43 +08:00
nkorange
9898a3c8e4 Merge branch 'develop' into feature_multi_tenant
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/DomainsManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/HttpClient.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/UtilsAndCommons.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java
#	test/src/test/java/com/alibaba/nacos/test/naming/RestAPI_ITCase.java
2019-01-11 14:08:13 +08:00
nkorange
63cf9dd00a Fix #599 2019-01-09 20:36:08 +08:00
nkorange
c7800b42bd fix #587 2019-01-09 10:08:05 +08:00
universefeeler
214ec62b90 delete some conflict sign 2019-01-04 23:03:12 +08:00
universefeeler
0a5f627808 fixed conflict 2019-01-04 22:34:58 +08:00
nkorange
720ab596a7 #497 Make subscription by query optional 2019-01-04 15:24:10 +08:00
FrankBian
b7e0f344fb correct typos,and remove some unnecessary 'public' method modifier 2018-12-29 17:40:15 +08:00
FrankBian
acc4e337d2 clean code,remove repeat code 2018-12-29 17:21:10 +08:00
wanglei1
34889e62a1 format codes and correct comments for nacos-api 2018-12-27 21:24:35 +08:00
nkorange
478cb1533e #498 Naming supports namespace 2018-12-25 16:48:27 +08:00
nkorange
947e0439b0 #269 Register instance with tenant info 2018-12-19 11:02:31 +08:00
nkorange
64f29ddd78 #187 Add label dump task 2018-12-18 16:03:26 +08:00
nkorange
066aaeaec0 Merge branch 'master' into 0.7.0
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	console/src/main/resources/static/console-fe/src/i18ndoc.js
#	console/src/main/resources/static/console-fe/src/locales/en-US.js
#	console/src/main/resources/static/console-fe/src/locales/zh-CN.js
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	pom.xml
#	test/pom.xml
2018-12-14 17:55:20 +08:00
nkorange
d2e4f4e6b4 Merge branch 'feature_cmdb' into 0.7.0
# Conflicts:
#	api/pom.xml
#	api/src/main/java/com/alibaba/nacos/api/exception/NacosException.java
#	client/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/config/impl/HttpSimpleClient.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/conf/application.properties
#	distribution/conf/nacos-logback.xml
#	distribution/pom.xml
#	distribution/release-nacos.xml
#	example/pom.xml
#	naming/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	pom.xml
#	test/pom.xml
2018-12-14 17:15:32 +08:00
nkorange
7a64ce2177 #187 Fix bug 2018-12-14 17:00:18 +08:00
nkorange
f96794e170 #187 Fix bug 2018-12-13 20:01:07 +08:00
Zhen Tang
98e447e146 Fix typo: Long pulling -> Long polling. 2018-12-13 09:13:28 +08:00
nkorange
8c50599a15 #429 Filter services by metadata 2018-12-11 16:10:48 +08:00