xuechaos
|
f88b8018b5
|
merge develop to fix merge
|
2019-02-28 19:50:33 +08:00 |
|
xuechaos
|
0ca7323df9
|
#588 build client and dependenties use 1.6
|
2019-02-28 17:52:06 +08:00 |
|
hxy1991
|
41e6ec9cbb
|
Fixes #826
|
2019-02-28 17:50:29 +08:00 |
|
hxy1991
|
0e9d3e678a
|
Fixes #240 #826 #827 #828
|
2019-02-26 14:22:38 +08:00 |
|
qingliang.ql
|
45d94f8935
|
metrics
|
2019-02-18 15:14:48 +08:00 |
|
qingliang.ql
|
474438001d
|
Merge branch 'develop' into feature_metrics
|
2019-02-18 10:50:45 +08:00 |
|
Darkness463
|
5760d13520
|
Fix https://github.com/alibaba/nacos/issues/768: Client beat interval.
|
2019-02-15 21:51:47 +08:00 |
|
qingliang.ql
|
4eaf0e7fbf
|
fix not support java 1.7
|
2019-02-13 15:31:17 +08:00 |
|
wuyoushan
|
b26f9f2fae
|
fix HttpSimpleClient npe bug
|
2019-01-23 16:40:46 +08:00 |
|
water.lyl
|
f29209b114
|
release 0.8
|
2019-01-22 22:16: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 |
|
Fury Zhu
|
15aec2aa61
|
Merge branch 'develop' into feature_subscription_by_query_optional
|
2019-01-14 14:28:53 +08:00 |
|
nkorange
|
55e1269ee1
|
#498 Merge develop
|
2019-01-12 22:43:24 +08:00 |
|
qingliang.ql
|
93d2bd253d
|
fix invoke method error
|
2019-01-11 15:47:42 +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
|
63cf9dd00a
|
Fix #599
|
2019-01-09 20:36:08 +08:00 |
|
qingliang.ql
|
052901f27f
|
support java 6
|
2019-01-09 20:06:02 +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 |
|
nkorange
|
c7800b42bd
|
fix #587
|
2019-01-09 10:08:05 +08:00 |
|
Keep
|
33e5e47832
|
Merge pull request #563 from huangyunbin/limiter
#562 Limiter DEFAULT_LIMIT optimization
|
2019-01-08 11:28:00 +08:00 |
|
qingliang.ql
|
d1a09847fe
|
client metrics
|
2019-01-07 20:31:45 +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 |
|
FrankBian
|
41001899db
|
format code: add @Override; translate some chinese msg to english; remove unneccessary method modifier
|
2019-01-07 15:48:01 +08:00 |
|
nkorange
|
720ab596a7
|
#497 Make subscription by query optional
|
2019-01-04 15:24:10 +08:00 |
|
cloud.huang
|
5881214631
|
#562 Limiter DEFAULT_LIMIT optimization
|
2019-01-03 18:43:53 +08:00 |
|
nkorange
|
571031eb0c
|
Fix #527
|
2018-12-27 00:28:39 +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 |
|
hxy1991
|
0b65e34fd0
|
Fixes #336 #439
|
2018-12-19 10:36:59 +08:00 |
|
nkorange
|
dc36c24f17
|
#187 Add debug log
|
2018-12-18 17:35:22 +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 |
|
Zhen Tang
|
6fb97c44e7
|
Revert changes in HTTP header for backward compatibility.
|
2018-12-13 09:13:51 +08:00 |
|
Zhen Tang
|
98e447e146
|
Fix typo: Long pulling -> Long polling.
|
2018-12-13 09:13:28 +08:00 |
|
Zhen Tang
|
d5fcfc4a81
|
Fix typo: PushRecver -> PushReceiver
|
2018-12-13 09:13:05 +08:00 |
|
nkorange
|
a5e564dbe5
|
Update version to 0.6.1
|
2018-12-11 17:15:57 +08:00 |
|
nkorange
|
1b3c5fb4ba
|
Prepare for 0.6.1
|
2018-12-11 16:34:43 +08:00 |
|
nkorange
|
8c50599a15
|
#429 Filter services by metadata
|
2018-12-11 16:10:48 +08:00 |
|
hxy1991
|
97743685ac
|
Fixes #363
|
2018-12-10 19:53:15 +08:00 |
|
nkorange
|
7115834a98
|
#421 Fixed
|
2018-12-10 19:52:58 +08:00 |
|
nkorange
|
3198ec69ca
|
#187 Refactor some logic
|
2018-12-10 15:37:48 +08:00 |
|