Commit Graph

216 Commits

Author SHA1 Message Date
nkorange
41c60abfa1 #677 Add ephemeral instance implementation 2019-01-24 17:54:56 +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
19b785b20d Merge branch 'develop' into feature_naming_ap
# 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/controllers/RaftController.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	pom.xml
#	test/pom.xml
2019-01-23 13:50:02 +08:00
nkorange
bef5407022 Merge remote-tracking branch 'origin/develop' into develop 2019-01-23 11:58:43 +08:00
nkorange
ab60c19e89 #498 fix parameter not decoded bug 2019-01-23 11:58:31 +08:00
water.lyl
f29209b114 release 0.8 2019-01-22 22:16:13 +08:00
nkorange
d850ceefb0 #498 fix bug 2019-01-22 21:46:52 +08:00
nkorange
cee461437a #498 fix bug 2019-01-22 21:34:07 +08:00
nkorange
58acdb1bf8 #651 Remove APICommands 2019-01-22 20:55:11 +08:00
nkorange
54d4dce869 Close #678 2019-01-22 16:47:33 +08:00
nkorange
55178a6b2c #498 Fix bug 2019-01-22 15:43:23 +08:00
nkorange
bc4d4d3c8d #502 Partition Protocol develop finished 2019-01-22 14:33:58 +08:00
nkorange
257f54a50b #502 Refactor data model 2019-01-21 19:26:26 +08:00
nkorange
a72467e077 Merge branch 'feature_multi_tenant' into feature_naming_ap
# Conflicts:
#	console/src/main/resources/META-INF/nacos-default.properties
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
2019-01-21 15:06:00 +08:00
nkorange
3f6c56f81c Fix #668 2019-01-21 14:51:37 +08:00
nkorange
e9ddfd7e29 #502 Receive data sync 2019-01-21 14:28:59 +08:00
zhanglong
25e4b86755 Fix update instance info NPE #663 2019-01-20 21:49:20 +08:00
nkorange
330fc4e6dc #502 Partition consistency start coding 2019-01-20 20:55:43 +08:00
nkorange
f2b43fb240 #502 Update author information 2019-01-19 21:23:35 +08:00
nkorange
bf80ff1622 #650 Add ServerListManager 2019-01-19 18:24:50 +08:00
nkorange
38e84cfb62 #502 Fix PMD 2019-01-17 19:50:57 +08:00
nkorange
cc1f6647b0 #502 Fix error log print 2019-01-17 17:12:44 +08:00
nkorange
0e76f55a3f #502 Fix health check processor inject bean failed problem 2019-01-17 16:42:15 +08:00
nkorange
806e7030d2 #502 Fix bean inject error 2019-01-17 10:15:51 +08:00
nkorange
7fa9c3afee #502 merge code 2019-01-16 18:24:06 +08:00
nkorange
980e2a62ef Merge branch 'feature_multi_tenant' into feature_naming_ap
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/RaftStore.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/VirtualClusterDomain.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/Switch.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchDomain.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
2019-01-16 18:12:54 +08:00
nkorange
dee6857d28 #498 fix bug 2019-01-16 14:52:18 +08:00
nkorange
b5f09f63db #502 make build pass 2019-01-16 10:46:22 +08:00
nkorange
425a80167b Merge branch 'feature_multi_tenant' into feature_naming_ap
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
2019-01-15 18:15:55 +08:00
nkorange
705a47e5d2 #498 fix bug 2019-01-15 14:53:30 +08:00
nkorange
65408a6194 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-15 11:41:59 +08:00
nkorange
d0bfc0e179 Merge branch 'feature_multi_tenant' into feature_naming_ap
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HttpHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/MysqlHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/TcpSuperSenseProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
2019-01-14 16:59:13 +08:00
nkorange
7abee38ff4 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:58 +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
nkorange
4cfae1bfbe #502 Clean code 2019-01-14 14:31:07 +08:00
nkorange
93f944602a #502 Refactor raft implementation 2019-01-14 13:09:04 +08:00
nkorange
baa4b4c1f1 #502 Update pom version 2019-01-13 10:26:23 +08:00
nkorange
82fd3df2a5 Merge branch 'feature_multi_tenant' into feature_naming_ap
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/DistroMapper.java
2019-01-13 10:21:14 +08:00
nkorange
55e1269ee1 #498 Merge develop 2019-01-12 22:43:24 +08:00
Fury Zhu
f82e080a64
Merge pull request #612 from alibaba/feature_metrics
surpport metrics
2019-01-11 19:32:14 +08:00
Fury Zhu
84a64d3846
Merge pull request #606 from nanamikon/develop
issue #579 update health in none health check mode through api
2019-01-11 19:31:25 +08:00
qingliang.ql
5891ae0a75 separate log and metrics 2019-01-11 18:03:27 +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
ad0a059a1d fix #592 2019-01-11 13:07:08 +08:00
nkorange
e707c043ad fix #609 2019-01-11 10:38:03 +08:00
nkorange
791b7c3739 #603 Other files formatted 2019-01-10 18:53:18 +08:00
nkorange
7307108ca7 #498 Fix bug 2019-01-10 15:51:20 +08:00
nkorange
0b7649880a #603 RaftCore log format 2019-01-10 15:50:06 +08:00
kaitai.zj
5b8341f224 issue #579 update health in none health check mode through api 2019-01-10 14:43:47 +08:00