Commit Graph

35 Commits

Author SHA1 Message Date
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
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
baa4b4c1f1 #502 Update pom version 2019-01-13 10:26:23 +08:00
qingliang.ql
62849ec816 naming metrics 2019-01-07 20:54:09 +08:00
nkorange
fed3c3f986 #498 Rename healthController bean and update pom version to 0.8.0-SNAPSHOT 2019-01-07 17:57:13 +08:00
nkorange
be64c1acf7 Update version to 0.7.0 2018-12-14 17:48:57 +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
xuechaos
d4edde980b Nacos release 0.6.0 version
#388 Cluster name should be provided in the Instance
#377 Clean up messy code in Naming module
#369 Support instance list persisted on disk
#366 findbugs-maven-plugin version
#362 The metadata will lost when online or offline instance through web ui
#352 Refactoring internationalization Nacos console
#278 Nacos docker img
#243 optimize the efficiency of integration testing, it’s taking too long now
2018-12-07 15:19:43 +08:00
nkorange
aace49640a #187 provide CMDB module 2018-12-05 12:08:49 +08:00
nkorange
78523976ba #97 Support integrating to third-party CMDB to filter service providers by their labels. 2018-12-03 17:56:11 +08:00
dungu.zpf
d795ad7d2b 0.5.0 release 2018-11-19 19:54:08 +08:00
Fury Zhu
ea03905ae9
Merge branch 'master' into naming-model-refactor 2018-11-16 18:16:51 +08:00
water.lyl
7fdd80cc31 update version to 0.4.0 2018-11-05 20:34:37 +08:00
nkorange
aa7e2e41e7 remove ip use weak raft 2018-10-30 16:16:01 +08:00
xuechaos
077c4cdb6f release Nacos 0.3.0, update version to 0.3.0 2018-10-26 21:55:05 +08:00
xuechaos
1fbcf24521 update 0.3.0-RC1 uppercase letter 2018-10-19 18:36:29 +08:00
nkorange
534995a405 Resolve conflicts 2018-10-18 18:59:45 +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
dungu.zpf
fe47b683b3 1. Support get service detail, cluster detail and instance detail in a single method;
2. Server model refactored to extend classes in nacos-api;
2018-10-06 10:22:01 +08:00
mercyblitz
a203ab309f Polish alibaba/nacos#94 : remove <filtering>true</filtering> 2018-10-03 04:01:40 +08:00
mercyblitz
8a73c805d8 Polish alibaba/nacos#110 : remove application.properties and copy to META-INF/nacos-default.properties 2018-10-03 01:18:09 +08:00
mercyblitz
3b5eb060e8 Polish alibaba/nacos#103 2018-10-01 12:15:21 +08:00
mercyblitz
be8f3c2052 Polish alibaba/nacos#103 2018-10-01 10:58:27 +08:00
mercyblitz
85df9e077f Fixed alibaba/nacos#98 2018-09-30 16:41:40 +08:00
xxc
0b5add22c7
Merge pull request #81 from alibaba/0.2.2
0.2.2
2018-09-27 14:28:08 +08:00
nkorange
44cf03db2d Update version to 0.2.1 2018-09-27 14:22:19 +08:00
caogu.wyp@alibaba-inc.com
5803c6b34d fix duplicate Maven dependencies(#82) 2018-09-27 00:04:06 +08:00
nkorange
adafaf7086 Merge branch 'master' into 0.2.2 2018-09-26 21:20:22 +08:00
xuechaos
d24f8680d9 fix mvn -B clean apache-rat:check
close #79
2018-09-26 20:05:17 +08:00
nkorange
b54a0a9b9d Update version to 0.2.2-SNAPSHOT 2018-09-21 16:46:49 +08:00
hxy1991
357702afaa Modify the version to 0.2.1-RC1 2018-09-21 15:46:53 +08:00
xuechaos
b5fe4fd434 client jdk support 1.6 and del unuse file 2018-09-19 22:18:31 +08:00
mercyblitz
1145260d64 Update 0.2.1 and refactor some APIs 2018-09-15 13:50:25 +08:00
nkorange
6bc052153d Update version to 0.2.0 2018-09-12 14:13:38 +08:00
xingxuechao
91d20f34fd nacos is coming 2018-07-21 00:27:23 +08:00