yanlinly
|
328fb09288
|
Merge pull request #622 from wfnuser/feature/login
Feature/login
|
2019-01-15 10:32:05 +08:00 |
|
water.lyl
|
c9d32ed260
|
Fix #381 fix findbugs
|
2019-01-14 23:21:32 +08:00 |
|
xxc
|
6815902d85
|
Merge pull request #620 from paderlol/develop
The version of the Nacos banner automatically references the maven version
|
2019-01-14 22:42:23 +08:00 |
|
zhanglong
|
bf305eaa0e
|
Fix #619
|
2019-01-14 22:07:49 +08:00 |
|
wfnuser
|
65f2ab2d2c
|
add username and password validator
|
2019-01-14 21:33:57 +08:00 |
|
wfnuser
|
90c4159d06
|
fix conlict
|
2019-01-14 21:08:34 +08:00 |
|
wfnuser
|
062cc07be1
|
the problem of locale
|
2019-01-14 20:48:18 +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 |
|
Fury Zhu
|
15aec2aa61
|
Merge branch 'develop' into feature_subscription_by_query_optional
|
2019-01-14 14:28:53 +08:00 |
|
nkorange
|
93f944602a
|
#502 Refactor raft implementation
|
2019-01-14 13:09:04 +08:00 |
|
pader
|
3683c32c66
|
Merge pull request #1 from alibaba/develop
Pull the latest code
|
2019-01-14 11:34:28 +08:00 |
|
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 |
|