wuyoushan
938666c7b8
remove useless semicolon
2019-01-17 18:02:44 +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
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
hxy1991
30e7c5273a
Fixes #363
2018-12-01 13:57:03 +08:00
nkorange
e3e6682231
Modify author info
2018-11-30 13:25:58 +08:00
dungu.zpf
d795ad7d2b
0.5.0 release
2018-11-19 19:54:08 +08:00
nkorange
93246b3ded
Merge branch 'naming-model-refactor' into develop
...
# Conflicts:
# console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigEditor/ConfigEditor.js
# console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
# naming/src/main/java/com/alibaba/nacos/naming/misc/NetUtils.java
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
2018-11-16 19:59:15 +08:00
Fury Zhu
ea03905ae9
Merge branch 'master' into naming-model-refactor
2018-11-16 18:16:51 +08:00
nkorange
46c141900e
Fix PMD
2018-11-16 12:07:25 +08:00
hxy1991
af21897608
correct license
2018-11-16 10:28:28 +08:00
nkorange
361ae0b2dd
Fix raft publish bug
2018-11-15 14:19:08 +08:00
nkorange
d3751a99af
#209 Disable service and cluster level customization in client
2018-11-08 16:34:18 +08:00
water.lyl
7fdd80cc31
update version to 0.4.0
2018-11-05 20:34:37 +08:00
nkorange
bbc3c24226
Use HTTP redirect instead of resend request
2018-11-05 17:09:00 +08:00
nkorange
1a9a282682
#176 Bypass local cache at client start by default.
2018-10-31 17:14:17 +08:00
nkorange
aa7e2e41e7
remove ip use weak raft
2018-10-30 16:16:01 +08:00
water.lyl
70651a89a7
Fix #38
2018-10-30 11:06:55 +08:00
xuechaos
077c4cdb6f
release Nacos 0.3.0, update version to 0.3.0
2018-10-26 21:55:05 +08:00
