nkorange
|
4260906973
|
Fix #762
|
2019-02-14 16:02:37 +08:00 |
|
nkorange
|
5a68d60a10
|
Fix #688
|
2019-01-23 15:57:44 +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
|
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
|
3f6c56f81c
|
Fix #668
|
2019-01-21 14:51:37 +08:00 |
|
zhanglong
|
25e4b86755
|
Fix update instance info NPE #663
|
2019-01-20 21:49:20 +08:00 |
|
nkorange
|
dee6857d28
|
#498 fix bug
|
2019-01-16 14:52:18 +08:00 |
|
nkorange
|
705a47e5d2
|
#498 fix bug
|
2019-01-15 14:53:30 +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
|
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 |
|
nkorange
|
21f811e77b
|
#498 Fix bug
|
2019-01-10 14:39:45 +08:00 |
|
nkorange
|
366ffcd3fe
|
#498 Fix bug
|
2019-01-10 10:57:20 +08:00 |
|
qingliang.ql
|
052901f27f
|
support java 6
|
2019-01-09 20:06:02 +08:00 |
|
nkorange
|
e240f2d92f
|
#498 Fix bug
|
2019-01-09 16:26:08 +08:00 |
|
nkorange
|
a1444124ea
|
#498 Fix bug
|
2019-01-09 16:12:21 +08:00 |
|
qingliang.ql
|
4101814db6
|
add license
|
2019-01-09 12:05:14 +08:00 |
|
qingliang.ql
|
fb5bbf3689
|
merge develop
|
2019-01-09 11:27:51 +08:00 |
|
qingliang.ql
|
4bcf4313e3
|
collect metrics to metrics monitor
|
2019-01-09 10:35:24 +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
|
3250533516
|
#526 Make more effort
|
2018-12-29 13:44:12 +08:00 |
|
nkorange
|
6deb198e2c
|
Fix #526
|
2018-12-27 00:30:23 +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 |
|
gqxie
|
a4c2ffe82a
|
fix some spelling mistakes
|
2018-12-19 16:57:27 +08:00 |
|
gqxie
|
4420c319dd
|
fix a spelling mistake
|
2018-12-19 14:08:50 +08:00 |
|
nkorange
|
947e0439b0
|
#269 Register instance with tenant info
|
2018-12-19 11:02:31 +08:00 |
|
nkorange
|
7fac0909d4
|
Fix build error
|
2018-12-14 22:47:09 +08:00 |
|
nkorange
|
066aaeaec0
|
Merge branch 'master' into 0.7.0
# Conflicts:
# api/pom.xml
# client/pom.xml
# common/pom.xml
# config/pom.xml
# console/pom.xml
# console/src/main/resources/static/console-fe/src/i18ndoc.js
# console/src/main/resources/static/console-fe/src/locales/en-US.js
# console/src/main/resources/static/console-fe/src/locales/zh-CN.js
# core/pom.xml
# distribution/pom.xml
# example/pom.xml
# naming/pom.xml
# pom.xml
# test/pom.xml
|
2018-12-14 17:55:20 +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
|
a631ec3bf7
|
Fix #461
|
2018-12-14 16:23:04 +08:00 |
|
nkorange
|
f96794e170
|
#187 Fix bug
|
2018-12-13 20:01:07 +08:00 |
|