Commit Graph

989 Commits

Author SHA1 Message Date
water.lyl
78f3e44839 Fix #381 update mysql user table and security ignore url 2019-01-13 20:39:35 +08:00
water.lyl
a25e5eb650 Fix #381 disable auth config 2019-01-13 13:19:12 +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
104a7c55aa #498 Fix test case bug 2019-01-12 22:46:44 +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
qingliang.ql
93d2bd253d fix invoke method error 2019-01-11 15:47:42 +08:00
TsingLiang
687fb500ec
Merge pull request #593 from alibaba/feature_metrics
Feature metrics
2019-01-11 15:13:57 +08:00
qingliang.ql
55c8f038e3 merge develop 2019-01-11 14:27:19 +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
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
nkorange
e707c043ad fix #609 2019-01-11 10:38:03 +08:00
nkorange
31c95a81c5 Merge remote-tracking branch 'origin/feature_multi_tenant' into feature_multi_tenant 2019-01-10 18:53:41 +08:00
nkorange
791b7c3739 #603 Other files formatted 2019-01-10 18:53:18 +08:00
zhichen
1c9290c309
Merge pull request #607 from jameslcj/hotfix_499
fix #499
2019-01-10 16:58:49 +08:00
xiaochun.xxc
c0ccbe9e53 update testcases 2019-01-10 16:25:12 +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
zhichen
9789e13bf6 fix #499 2019-01-10 15:14:51 +08:00
zhichen
b464ce193e fix #499 2019-01-10 15:13:37 +08:00
zhichen
3e02d0d595 fix #499 2019-01-10 15:02:58 +08:00
kaitai.zj
5b8341f224 issue #579 update health in none health check mode through api 2019-01-10 14:43:47 +08:00
nkorange
21f811e77b #498 Fix bug 2019-01-10 14:39:45 +08:00
王彦民
829f538e9f refactor: clean code && Upgrade 2019-01-10 14:06:29 +08:00
nkorange
366ffcd3fe #498 Fix bug 2019-01-10 10:57:20 +08:00
nkorange
5290c16539 #498 Update test case 2019-01-09 21:08:05 +08:00
nkorange
ec8117d7cd Merge remote-tracking branch 'origin/feature_multi_tenant' into feature_multi_tenant 2019-01-09 20:36:21 +08:00
nkorange
63cf9dd00a Fix #599 2019-01-09 20:36:08 +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
qingliang.ql
052901f27f support java 6 2019-01-09 20:06:02 +08:00
fudali
8ef18cbe7a fix: 添加新加测试文件授权头信息 2019-01-09 17:17:51 +08:00
nkorange
e240f2d92f #498 Fix bug 2019-01-09 16:26:08 +08:00
fudali
0a229a7fcf fix: 在获取客服端真实 ip 的方法中添加获取根据 X-Forwarded-For header 来进行获取的实现 2019-01-09 16:21:38 +08:00
fudali
9ac02e638b feat: 获取客服端 ip 支持 X-Forwarded-For header 2019-01-09 16:13:31 +08:00
nkorange
1782041559 Merge remote-tracking branch 'origin/feature_multi_tenant' into feature_multi_tenant 2019-01-09 16:12:36 +08:00
nkorange
a1444124ea #498 Fix bug 2019-01-09 16:12:21 +08:00
xiaochun.xxc
4e1f587665 modify testcases 2019-01-09 16:04:28 +08:00
qingliang.ql
72f69902bc tomcat access log 2019-01-09 16:02:34 +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
王彦民
5d6085fcee refactor: ConfigRollback i18n #474 2019-01-09 15:17:59 +08:00
xiaochun.xxc
55e750e3d2 add multi tenant testcases 2019-01-09 15:16:15 +08:00