Commit Graph

106 Commits

Author SHA1 Message Date
nkorange
f2b43fb240 #502 Update author information 2019-01-19 21:23:35 +08:00
nkorange
d064fe36bb Merge branch 'develop' into feature_naming_ap 2019-01-18 11:38:20 +08:00
nkorange
38e84cfb62 #502 Fix PMD 2019-01-17 19:50:57 +08:00
nkorange
806e7030d2 #502 Fix bean inject error 2019-01-17 10:15:51 +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
xiaochun.xxc
9e652a21df Revert "service list testcases"
This reverts commit 94eb697e45.
2019-01-15 19:27:55 +08:00
xiaochun.xxc
5c4662ae48 Revert "rename service list IT case"
This reverts commit eb83e7607f.
2019-01-15 19:26:11 +08:00
xiaochun.xxc
e9f0b548c9 Revert "add api testcases”"
This reverts commit 63c704a1eb.
2019-01-15 19:25:33 +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
mingyixu
a689f0f694
Merge branch 'develop' into master 2019-01-15 17:00:43 +08:00
xiaochun.xxc
63c704a1eb add api testcases” 2019-01-15 15:17:07 +08:00
xiaochun.xxc
eb83e7607f rename service list IT case 2019-01-15 15:00:40 +08:00
nkorange
e9811c84c6 Merge branch 'develop' into feature_multi_tenant 2019-01-15 14:55:59 +08:00
xiaochun.xxc
94eb697e45 service list testcases 2019-01-15 14:40:03 +08:00
wfnuser
973c522834 fix conflict 2019-01-15 12:48:28 +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
water.lyl
78f3e44839 Fix #381 update mysql user table and security ignore url 2019-01-13 20:39:35 +08:00
nkorange
baa4b4c1f1 #502 Update pom version 2019-01-13 10:26:23 +08:00
nkorange
104a7c55aa #498 Fix test case bug 2019-01-12 22:46:44 +08:00
qingliang.ql
55c8f038e3 merge develop 2019-01-11 14:27:19 +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
qingliang.ql
eb2c33a88e metrics agent 2019-01-11 13:56:37 +08:00
nkorange
ad0a059a1d fix #592 2019-01-11 13:07:08 +08:00
xiaochun.xxc
c0ccbe9e53 update testcases 2019-01-10 16:25:12 +08:00
nkorange
5290c16539 #498 Update test case 2019-01-09 21:08:05 +08:00
Keep
8fdbf685a8
Merge pull request #596 from fudali113/fix-get-remote-ip
Fixes #595
2019-01-09 20:35:17 +08:00
xiaochun.xxc
9ff91ba621 testcase assert 2019-01-09 20:20:57 +08:00
xiaochun.xxc
f94c7878f3 add multiTenant api testcases” 2019-01-09 20:10:21 +08:00
xiaochun.xxc
4e1f587665 modify testcases 2019-01-09 16:04:28 +08:00
xiaochun.xxc
48e2dcc041 delete data 2019-01-09 15:52:14 +08:00
xiaochun.xxc
64489edb1e add multi tenant testcases 2019-01-09 15:48:08 +08:00
xiaochun.xxc
0eac9b89ca Revert "add multi tenant testcases"
This reverts commit f7791b64cf.
2019-01-09 15:31:17 +08:00
xiaochun.xxc
55e750e3d2 add multi tenant testcases 2019-01-09 15:16:15 +08:00
xiaochun.xxc
f7791b64cf add multi tenant testcases 2019-01-09 15:13:36 +08:00
nkorange
0df5798147 #498 Update test case 2019-01-07 21:17:31 +08:00
xiaochun.xxc
0987ff32a8 增加open api用例 2019-01-07 20:41:13 +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
3250533516 #526 Make more effort 2018-12-29 13:44:12 +08:00
nkorange
16794d15e5 #523 add switch 2018-12-25 20:59:08 +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
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
nkorange
7a64ce2177 #187 Fix bug 2018-12-14 17:00:18 +08:00
nkorange
8c50599a15 #429 Filter services by metadata 2018-12-11 16:10:48 +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
mingyixu
ea1e8ab9dc
Merge pull request #394 from mingyixu/master
[ISSUE #243]fix Integration testing too long
2018-12-06 19:42:29 +08:00
mingyixu
c634ff8da2 [ISSUE #243]fix Integration testing too long 2018-12-05 18:56:34 +08:00