nkorange
cc1f6647b0
#502 Fix error log print
2019-01-17 17:12:44 +08:00
nkorange
0e76f55a3f
#502 Fix health check processor inject bean failed problem
2019-01-17 16:42:15 +08:00
nkorange
806e7030d2
#502 Fix bean inject error
2019-01-17 10:15:51 +08:00
nkorange
7fa9c3afee
#502 merge code
2019-01-16 18:24:06 +08:00
nkorange
980e2a62ef
Merge branch 'feature_multi_tenant' into feature_naming_ap
...
# Conflicts:
# naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/RaftCore.java
# naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/RaftStore.java
# naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
# naming/src/main/java/com/alibaba/nacos/naming/core/VirtualClusterDomain.java
# naming/src/main/java/com/alibaba/nacos/naming/misc/Switch.java
# naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchDomain.java
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
2019-01-16 18:12:54 +08:00
nkorange
dee6857d28
#498 fix bug
2019-01-16 14:52:18 +08:00
nkorange
b5f09f63db
#502 make build pass
2019-01-16 10:46:22 +08:00
nkorange
425a80167b
Merge branch 'feature_multi_tenant' into feature_naming_ap
...
# Conflicts:
# naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
2019-01-15 18:15:55 +08:00
nkorange
705a47e5d2
#498 fix bug
2019-01-15 14:53:30 +08:00
nkorange
65408a6194
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-15 11:41:59 +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
nkorange
93f944602a
#502 Refactor raft implementation
2019-01-14 13:09:04 +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
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
f0a8ece552
#502 Add new consistency package
2019-01-07 11:34:44 +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
nkorange
5f6bdf2d39
Update expression syntax
2018-12-13 15:12:57 +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
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
anjia0532
0c5654cec8
1. change charset to UTF-8(replace GBK or utf8)
...
2. support custom nacos server logs path in application* profile(key:nacos.logs.path)
2018-12-09 13:24:17 +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
JianweiWang
3f5955f69c
Merge pull request #392 from alibaba/hotfix_cluster_lost_in_instance
...
Hotfix cluster lost in instance
2018-12-05 17:08:48 +08:00
nkorange
cce2679670
Fix #388
2018-12-05 14:11:03 +08:00
nkorange
aace49640a
#187 provide CMDB module
2018-12-05 12:08:49 +08:00
nkorange
3ae5e20898
#387 refactor service operate url
2018-12-05 12:07:29 +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
JianweiWang
be0ba62bbd
Merge pull request #378 from alibaba/feature_debug_log
...
#377 Clean up code
2018-12-02 18:00:36 +08:00
nkorange
5f60644d9e
#377 Clean up code
2018-12-02 17:40:06 +08:00
nkorange
75d9d24345
#369 Update property name
2018-11-30 22:35:43 +08:00
nkorange
e3e6682231
Modify author info
2018-11-30 13:25:58 +08:00
nkorange
c2672953d2
#369 Instance list persisted on disk if enabled.
2018-11-30 13:24:03 +08:00
Fury Zhu
79745783e9
Merge pull request #361 from alibaba/hotfix_decide_leader_bug
...
Fix #357
2018-11-28 17:38:35 +08:00
nkorange
44cb206794
Fix #357
2018-11-28 15:47:21 +08:00
ethon
fb1cf6fcec
bugfix, when -Dnacos.preferHostnameOverIp=true , the localhostIp error . bug #325
2018-11-21 17:33:00 +08:00
dungu.zpf
d795ad7d2b
0.5.0 release
2018-11-19 19:54:08 +08:00
nkorange
807c7dc153
Fix raft publish unstable problem.
2018-11-19 16:58:19 +08:00
nkorange
3a6eafc4a1
Fix #172
2018-11-19 16:56:36 +08:00
nkorange
c7100e25f8
Fix conflict
2018-11-16 20:33:05 +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
eba3ca9c74
Fix ip registered failed bug
2018-11-15 15:25:45 +08:00
nkorange
361ae0b2dd
Fix raft publish bug
2018-11-15 14:19:08 +08:00
yanlinly
30919083e8
Merge pull request #247 from hxy1991/master
...
[ISSUE #222 ] [ISSUE #231 ] [ISSUE #246 ]
2018-11-12 10:49:32 +08:00
Fury Zhu
724ced4861
Merge pull request #213 from paderlol/develop
...
Fixes #193
2018-11-11 23:08:01 +08:00
zhanglong
d60c03edcd
support domain for server cluster into k8s
2018-11-11 15:15:09 +08:00
nkorange
24485abcf9
Fix #249
2018-11-08 21:28:20 +08:00
nkorange
8fe38f7dcb
Fix #249
2018-11-08 21:24:50 +08:00
nkorange
6aaae5d95f
Call local method instead of sending HTTP request to localhost
2018-11-08 19:50:34 +08:00
nkorange
d3751a99af
#209 Disable service and cluster level customization in client
2018-11-08 16:34:18 +08:00
hxy1991
0d90d6e895
Fixes #222 #231
2018-11-07 18:20:09 +08:00
nkorange
d6f4834688
Separate locked publish from unlocked publish
2018-11-07 11:28:46 +08:00
Fury Zhu
bdc3026798
Merge pull request #198 from alibaba/hotfix_update_service_error
...
Fix #197
2018-11-07 10:11:42 +08:00
Fury Zhu
3cbcbe94c0
Merge pull request #220 from nanamikon/master
...
PUT /instance should use param key "useIPPort4Check" instead of "userIPPort4Check"
2018-11-06 11:42:27 +08:00
nkorange
c348398d45
Fix #168
2018-11-06 09:45:07 +08:00
nkorange
db2a6498b6
Fix #181
2018-11-05 20:42:14 +08:00
water.lyl
7fdd80cc31
update version to 0.4.0
2018-11-05 20:34:37 +08:00
