nkorange
9409ebfd8b
Merge branch 'feature_naming_ap' into feature_naming_group
...
# Conflicts:
# client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
2019-02-18 08:49:41 +08:00
nkorange
dd9db82b7b
Merge develop
2019-02-14 19:33:33 +08:00
nkorange
9783240e9d
#269 Support service group
2019-02-13 15:46:28 +08:00
nkorange
194387b583
#745 Support multiple server modes
2019-02-11 14:59:12 +08:00
nkorange
58b8d1640f
#744 Add server status, #629 Add partition service warm up logic
2019-02-09 15:43:03 +08:00
nkorange
cba85f0635
#502 Fix licence problem
2019-02-02 15:14:16 +08:00
nkorange
ab562117d5
#502 Fix HTTP 302 use GET problem.
2019-02-01 19:59:41 +08:00
nkorange
d3a4834672
#650 Server list manager detects healthy servers
2019-01-30 10:06:37 +08:00
nkorange
caf7213c2d
#502 Fix serialize problem and do some refactoring for health check
2019-01-27 22:50:41 +08:00
nkorange
0e0900bfa9
#677 Add ephemeral instance implementation
2019-01-24 16:56:51 +08:00
nkorange
6ebde678d3
#502 Reorganize parameter mapping.
2019-01-23 15:33:20 +08:00
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
wuyoushan
938666c7b8
remove useless semicolon
2019-01-17 18:02:44 +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
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
baa4b4c1f1
#502 Update pom version
2019-01-13 10:26:23 +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
nkorange
63cf9dd00a
Fix #599
2019-01-09 20:36:08 +08:00
nkorange
c7800b42bd
fix #587
2019-01-09 10:08:05 +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
universefeeler
214ec62b90
delete some conflict sign
2019-01-04 23:03:12 +08:00
universefeeler
0a5f627808
fixed conflict
2019-01-04 22:34:58 +08:00
nkorange
720ab596a7
#497 Make subscription by query optional
2019-01-04 15:24:10 +08:00
FrankBian
b7e0f344fb
correct typos,and remove some unnecessary 'public' method modifier
2018-12-29 17:40:15 +08:00
FrankBian
acc4e337d2
clean code,remove repeat code
2018-12-29 17:21:10 +08:00
wanglei1
34889e62a1
format codes and correct comments for nacos-api
2018-12-27 21:24:35 +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
64f29ddd78
#187 Add label dump task
2018-12-18 16:03:26 +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
f96794e170
#187 Fix bug
2018-12-13 20:01:07 +08:00
Zhen Tang
98e447e146
Fix typo: Long pulling -> Long polling.
2018-12-13 09:13:28 +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
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
nkorange
0409aaecb0
#187 Add Java docs
2018-12-07 11:24:22 +08:00
nkorange
7d2f652b36
#187 Refactor selector
2018-12-06 20:14:07 +08:00
nkorange
aace49640a
#187 provide CMDB module
2018-12-05 12:08:49 +08:00
nkorange
78523976ba
#97 Support integrating to third-party CMDB to filter service providers by their labels.
2018-12-03 17:56:11 +08:00
hxy1991
cbc8b0a75a
Merge branch 'upstream-develop'
...
# Conflicts:
# api/src/main/java/com/alibaba/nacos/api/naming/listener/Event.java
# client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
# config/src/main/java/com/alibaba/nacos/config/server/utils/RunningConfigUtils.java
2018-12-03 10:29:40 +08:00
