Fury Zhu
|
9319b76d22
|
Merge pull request #1307 from pbting/namespace_unified
Namespace And Endpoint Support Multi Enviroment Switch
|
2019-06-04 17:15:26 +08:00 |
|
nkorange
|
138a15dcf3
|
Remove useless test
|
2019-06-04 16:53:17 +08:00 |
|
pbting
|
3b869fcdbe
|
change the comment from Chinese to English
|
2019-06-04 16:44:12 +08:00 |
|
pbting
|
9d57976167
|
change the comment from Chinese to English
|
2019-06-04 16:21:21 +08:00 |
|
pbting
|
302ae79b3f
|
1. 注释改成中文
2. StringUtils 统一改成
3. 参数命名改为 nacos 前缀
|
2019-06-04 15:55:47 +08:00 |
|
pbting
|
c4be24a536
|
nacos client namespace support multi enviroment switch
|
2019-05-31 15:21:58 +08:00 |
|
chuntaojun
|
01b74be838
|
refactor(client): delete useless test case
|
2019-05-13 11:19:52 +08:00 |
|
Fury Zhu
|
df6f3a8df7
|
Merge pull request #1130 from chuntaojun/feature_service_curd
[ISSUE #747、#1154] Add create and update service methods in SDK and update instance operation
|
2019-05-09 10:45:54 +08:00 |
|
chuntaojun
|
ac36a41d86
|
refactor(api、client): modify MaintainService to NamingMaintainService
|
2019-05-09 10:07:09 +08:00 |
|
chuntaojun
|
141f8a19ea
|
refactor(client):
|
2019-05-08 15:29:01 +08:00 |
|
Fury Zhu
|
756862060f
|
Merge pull request #1122 from Diffblue-benchmarks/add-diffblue-tests
Add unit tests for com.alibaba.nacos.client.utils.StringUtils
|
2019-05-08 08:26:24 +08:00 |
|
Fury Zhu
|
73ebb86055
|
Merge pull request #1170 from ddatsh/master
fix typo
|
2019-05-07 17:52:07 +08:00 |
|
chuntaojun
|
4817b26bc9
|
refactor(client): Fix the issues raised in the comments
|
2019-05-07 11:11:24 +08:00 |
|
peter zhang
|
eef6e73d94
|
fix typo
motify > modify
|
2019-05-06 15:25:02 +08:00 |
|
chuntaojun
|
f8ec782080
|
refactor(client): Delete Chinese comments
|
2019-05-05 10:12:30 +08:00 |
|
chuntaojun
|
320aca4d90
|
style(api): The revised code is in compliance with the specification
|
2019-04-30 19:27:06 +08:00 |
|
chuntaojun
|
f2c046a395
|
refactor(client): Service operation function module split
|
2019-04-30 17:46:10 +08:00 |
|
chuntaojun
|
79c3fc6547
|
Merge branch 'develop' of https://github.com/chuntaojun/nacos into feature_service_curd
|
2019-04-28 14:18:36 +08:00 |
|
chuntaojun
|
ea214e1d50
|
feat(client): add feature of service curd
|
2019-04-27 22:32:28 +08:00 |
|
huangyonghui
|
35f3842d1c
|
format code
|
2019-04-26 16:59:18 +08:00 |
|
huangyonghui
|
8ac94b61b4
|
NamingEvent add getGroupName and getClusters method
|
2019-04-24 15:08:16 +08:00 |
|
Keep
|
55242c8200
|
Merge pull request #996 from Summerslyb/fix-log4j2
[ISSUE #827] Fix Nacos Naming's log settings affect the root log
|
2019-04-19 20:29:33 +08:00 |
|
Eric Hettiaratchi
|
da2f4a1fd5
|
Add unit tests for com.alibaba.nacos.client.utils.StringUtils
These tests were written using Diffblue Cover.
|
2019-04-18 10:28:31 +01:00 |
|
得少
|
427a746e82
|
change the default value of isUseEndpointParsingRule from false to true
|
2019-04-12 12:49:46 +08:00 |
|
water.lyl
|
8175cd9aeb
|
namespace default empty
|
2019-04-11 00:58:06 +08:00 |
|
SLKun
|
ce0b863e47
|
fixes #827
|
2019-04-04 11:37:16 +08:00 |
|
得少
|
b71faa8496
|
change the stringutils dependency
|
2019-04-03 22:15:09 +08:00 |
|
得少
|
5a5e723cb2
|
erge branch 'develop' of https://github.com/pbting/nacos into develop
|
2019-04-03 19:37:14 +08:00 |
|
得少
|
a8ee39323f
|
StringUtils change the dependency
|
2019-04-03 19:36:31 +08:00 |
|
pbting
|
b7a1fb22b3
|
Merge branch 'develop' into develop
|
2019-04-03 19:08:09 +08:00 |
|
得少
|
4c86e63271
|
change the code
|
2019-04-03 18:45:16 +08:00 |
|
得少
|
eca7a9a422
|
support parsing endpoint rule
|
2019-04-03 18:31:27 +08:00 |
|
Fury Zhu
|
e0547c82ca
|
Merge pull request #997 from alibaba/feature_naming_group
Feature naming group
|
2019-04-02 20:57:04 +08:00 |
|
yanlinly
|
acaee3ffb5
|
Merge pull request #993 from alibaba/del_warnings
Remove spotbugs-annotations dependency
|
2019-04-02 10:31:06 +08:00 |
|
water.lyl
|
0b6246e9f5
|
remove lgpl dependency
|
2019-04-01 21:16:44 +08:00 |
|
xuechaos
|
178b80ea41
|
del warnings spotbugs-annotations #981
|
2019-04-01 21:16:14 +08:00 |
|
nkorange
|
4c5b06c5bb
|
Optimize code
|
2019-03-29 19:29:42 +08:00 |
|
water.lyl
|
d11fd7f73e
|
support aliyun ram role
|
2019-03-27 14:13:15 +08:00 |
|
nkorange
|
14ecd9c230
|
#502 Fix data inconsistent bug
|
2019-03-26 14:07:06 +08:00 |
|
nkorange
|
a745423dec
|
Merge branch 'develop' into feature_naming_group
# Conflicts:
# api/pom.xml
# client/pom.xml
# cmdb/pom.xml
# common/pom.xml
# config/pom.xml
# console/pom.xml
# core/pom.xml
# distribution/pom.xml
# example/pom.xml
# naming/pom.xml
# naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java
# naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchDomain.java
# pom.xml
# test/pom.xml
|
2019-03-25 15:03:31 +08:00 |
|
hxy1991
|
dcaca7e9a2
|
Fixes #925
|
2019-03-19 14:36:57 +08:00 |
|
nkorange
|
a902194bc6
|
Close #910
|
2019-03-18 10:31:57 +08:00 |
|
nkorange
|
6034bdbdb9
|
#502 Compatible with 0.8.0
|
2019-03-14 16:04:07 +08:00 |
|
nkorange
|
902a77aedd
|
Merge branch 'develop' into feature_naming_group
|
2019-03-13 18:43:13 +08:00 |
|
得少
|
6626b95273
|
change the isNotBlank to isBlank
|
2019-03-11 20:53:01 +08:00 |
|
nkorange
|
ac67b95d9f
|
Merge branch 'develop' into feature_naming_group
|
2019-03-11 17:36:23 +08:00 |
|
nkorange
|
5f07ce99e4
|
Fix #869
|
2019-03-11 17:32:52 +08:00 |
|
hxy1991
|
a57529ad7e
|
Fixes #880
|
2019-03-11 16:03:49 +08:00 |
|
nkorange
|
6ae100e390
|
Fix http client error
|
2019-03-08 10:43:26 +08:00 |
|
nkorange
|
366d9f3c30
|
Fix merge conflict
|
2019-03-07 19:36:40 +08:00 |
|
nkorange
|
dae2809630
|
Merge branch 'develop' into feature_naming_group
# Conflicts:
# api/pom.xml
# client/pom.xml
# client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
# client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
# client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
# client/src/main/java/com/alibaba/nacos/client/naming/utils/UtilAndComs.java
# cmdb/pom.xml
# common/pom.xml
# config/pom.xml
# console/pom.xml
# core/pom.xml
# distribution/pom.xml
# example/pom.xml
# naming/pom.xml
# pom.xml
# test/pom.xml
|
2019-03-07 19:24:22 +08:00 |
|
hxy1991
|
2584e59edf
|
Fixes #868
|
2019-03-07 14:46:34 +08:00 |
|
nkorange
|
dd0bd51617
|
Fix #866
|
2019-03-06 20:55:30 +08:00 |
|
nkorange
|
c4ad0888e0
|
#869 Clarify exception message
|
2019-03-06 11:59:15 +08:00 |
|
nkorange
|
7947fc29b1
|
#269 fix bug
|
2019-03-05 14:54:53 +08:00 |
|
得少
|
369f19608e
|
#863
|
2019-03-05 13:07:23 +08:00 |
|
nkorange
|
116e9119c2
|
#269 fix send client beat bug
|
2019-03-05 11:35:58 +08:00 |
|
得少
|
a9ff49692f
|
Optimize code design
|
2019-03-05 10:08:28 +08:00 |
|
得少
|
a05be5f97b
|
log format
|
2019-03-04 19:23:11 +08:00 |
|
得少
|
0774cb23d4
|
format log
|
2019-03-04 19:15:04 +08:00 |
|
得少
|
1869bea58f
|
format log
|
2019-03-04 18:50:35 +08:00 |
|
nkorange
|
8c23f34806
|
#269 fix bug
|
2019-03-04 17:12:29 +08:00 |
|
得少
|
43a51c0f25
|
#861
|
2019-03-04 16:56:01 +08:00 |
|
nkorange
|
616a8031bc
|
Merge branch 'develop' into feature_naming_group
# Conflicts:
# api/pom.xml
# client/pom.xml
# client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
# cmdb/pom.xml
# common/pom.xml
# config/pom.xml
# console/pom.xml
# core/pom.xml
# distribution/conf/application.properties
# distribution/pom.xml
# example/pom.xml
# naming/pom.xml
# naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java
# naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
# pom.xml
# test/pom.xml
|
2019-03-04 10:12:11 +08:00 |
|
hxy1991
|
41e6ec9cbb
|
Fixes #826
|
2019-02-28 17:50:29 +08:00 |
|
得少
|
c279d31c10
|
Merge remote-tracking branch 'origin/develop' into support_ans_developer
# Conflicts:
# client/src/main/java/com/alibaba/nacos/client/identify/CredentialWatcher.java
# client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
# client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
# client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
|
2019-02-27 20:42:30 +08:00 |
|
nkorange
|
ddf194ea00
|
Fix merge conflicts
|
2019-02-27 13:01:56 +08:00 |
|
nkorange
|
493715973f
|
Merge branch 'develop' into feature_naming_group
# Conflicts:
# client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
# client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
# client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
# naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
# naming/src/main/java/com/alibaba/nacos/naming/misc/NamingProxy.java
# naming/src/main/java/com/alibaba/nacos/naming/misc/NetUtils.java
# naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
# naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
|
2019-02-26 17:29:22 +08:00 |
|
hxy1991
|
0e9d3e678a
|
Fixes #240 #826 #827 #828
|
2019-02-26 14:22:38 +08:00 |
|
nkorange
|
8d762a5403
|
#502 User server proxy instead of client proxy
|
2019-02-22 21:57:33 +08:00 |
|
pbting
|
f5d2782901
|
Update NamingProxy.java
|
2019-02-22 17:43:54 +08:00 |
|
得少
|
b3ee9698fa
|
#817
|
2019-02-22 17:06:02 +08:00 |
|
nkorange
|
918dcf9905
|
#502 Fix bug
|
2019-02-20 20:09:59 +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 |
|
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
|
ede55b0e4f
|
Merge branch 'develop' into feature_naming_ap
|
2019-02-18 08:46:35 +08:00 |
|
Darkness463
|
5760d13520
|
Fix https://github.com/alibaba/nacos/issues/768: Client beat interval.
|
2019-02-15 21:51:47 +08:00 |
|
nkorange
|
469d976aee
|
#502 Fix sync timestamp repeat bug
|
2019-02-15 11:40:19 +08:00 |
|
pbting
|
5e78e9a315
|
Merge branch 'feature_support_ans' into 0.8.0-poc-support-ans
|
2019-02-15 11:08:03 +08:00 |
|
pbting
|
15e0f30849
|
fix #367
|
2019-02-14 18:00:01 +08:00 |
|
pbting
|
e9bbe492bb
|
code format with idea
|
2019-02-13 16:12:16 +08:00 |
|
nkorange
|
9783240e9d
|
#269 Support service group
|
2019-02-13 15:46:28 +08:00 |
|
pbting
|
1a6fa9e69c
|
support ans
|
2019-02-13 15:42:41 +08:00 |
|
qingliang.ql
|
4eaf0e7fbf
|
fix not support java 1.7
|
2019-02-13 15:31:17 +08:00 |
|
nkorange
|
81dd9fbc6b
|
#745 Support service creation in AP mode
|
2019-02-12 20:11:57 +08:00 |
|
nkorange
|
58b8d1640f
|
#744 Add server status, #629 Add partition service warm up logic
|
2019-02-09 15:43:03 +08:00 |
|
nkorange
|
026ec980c5
|
#502 Fix test case not pass problem
|
2019-02-02 11:32:39 +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
|
4560b3ca25
|
Merge branch 'develop' into feature_naming_ap
|
2019-01-25 11:51:31 +08:00 |
|
wuyoushan
|
b26f9f2fae
|
fix HttpSimpleClient npe bug
|
2019-01-23 16:40:46 +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
|
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 |
|
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
|
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 |
|
hxy1991
|
25819dce28
|
Fixes #229
|
2018-12-05 22:36:33 +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 |
|
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 |
|
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 |
|
liaozan
|
98ec99d84d
|
fix typo
|
2018-11-24 13:16:38 +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 |
|
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 |
|
lingwei.clw
|
b22284fc90
|
新增测试用例
|
2018-11-14 12:06:58 +08:00 |
|
nkorange
|
d3751a99af
|
#209 Disable service and cluster level customization in client
|
2018-11-08 16:34:18 +08:00 |
|
nkorange
|
3c608ab2e5
|
Fix #241
|
2018-11-08 16:28:36 +08:00 |
|
nkorange
|
1a9a282682
|
#176 Bypass local cache at client start by default.
|
2018-10-31 17:14:17 +08:00 |
|
nkorange
|
6e3f2ba31a
|
Merge branch 'master' into develop
|
2018-10-31 15:42:23 +08:00 |
|
nkorange
|
3e01285ab7
|
Merge branch 'hotfix-clientbeat-lose-info' into raft-performance
|
2018-10-30 20:11:30 +08:00 |
|
nkorange
|
dc7cb2bdee
|
Fix #190
|
2018-10-30 17:59:05 +08:00 |
|
water.lyl
|
563105ae4f
|
Fix #106
|
2018-10-30 17:52:01 +08:00 |
|
nkorange
|
6466218baf
|
Raft performance improved.
|
2018-10-29 20:34:12 +08:00 |
|
nkorange
|
855037cac6
|
Fix client side health check error
|
2018-10-25 13:22:22 +08:00 |
|
nkorange
|
f4e8684fdf
|
Fix #149
|
2018-10-24 17:54:34 +08:00 |
|
nkorange
|
c63f5899f6
|
Fix #139
|
2018-10-19 16:55:44 +08:00 |
|
nkorange
|
6da8bf89fc
|
Resolve conflicts and fix log error
|
2018-10-18 22:23:26 +08:00 |
|
nkorange
|
baa8594fe7
|
Merge branch 'master' into 0.3.0
# Conflicts:
# api/pom.xml
# config/pom.xml
# config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
# console/pom.xml
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
# naming/src/main/resources/application.properties
|
2018-10-18 17:11:32 +08:00 |
|
aCoder2013
|
a11d205fce
|
Fix potential NPE
|
2018-10-16 21:07:55 +08:00 |
|
小马哥
|
5c3ebf8f9f
|
Merge branch 'master' into 0.2.2
|
2018-10-15 17:10:48 +08:00 |
|
nkorange
|
71cf53361f
|
Fix test failed bug
|
2018-10-14 12:07:50 +08:00 |
|
dungu.zpf
|
86d8c7a4c4
|
fix #121 and refactor health check model
|
2018-10-11 16:11:48 +08:00 |
|
小马哥
|
55433f0995
|
Merge pull request #23 from javartisan/master
improving code quality
|
2018-10-09 10:13:58 +08:00 |
|
mercyblitz
|
99b5827409
|
Polish alibaba/nacos#101
|
2018-10-01 11:19:53 +08:00 |
|
mercyblitz
|
a718c84d4c
|
Polish alibaba/nacos#104
|
2018-10-01 10:48:34 +08:00 |
|
nkorange
|
adafaf7086
|
Merge branch 'master' into 0.2.2
|
2018-09-26 21:20:22 +08:00 |
|
xuechaos
|
d24f8680d9
|
fix mvn -B clean apache-rat:check
close #79
|
2018-09-26 20:05:17 +08:00 |
|
nkorange
|
f1c5dac508
|
Fix #78
|
2018-09-26 17:38:25 +08:00 |
|
nkorange
|
4b5bdec0ab
|
Fix #66, Enable deregistering the last instance
|
2018-09-21 16:13:41 +08:00 |
|
hxy1991
|
ee0575b1c2
|
Merge branch 'upstream' into 0.2.1
|
2018-09-19 21:17:22 +08:00 |
|
nkorange
|
0667224647
|
Fix #65 for naming
|
2018-09-19 19:35:45 +08:00 |
|
nkorange
|
09650c16eb
|
Fix #64
|
2018-09-19 19:16:42 +08:00 |
|
nkorange
|
f009fa1c9a
|
Fix #64
|
2018-09-19 19:14:19 +08:00 |
|
water.lyl
|
b9cd75b640
|
Fix #65
Nacos default port changed from 8080 to 8848
|
2018-09-19 19:06:03 +08:00 |
|
nkorange
|
52c306ae65
|
Adjust for jdk 1.7
|
2018-09-18 20:32:55 +08:00 |
|
hxy1991
|
59b6562e0d
|
Fix #62
|
2018-09-18 20:27:50 +08:00 |
|
nkorange
|
d7c35b4953
|
Fix #59
|
2018-09-18 15:49:57 +08:00 |
|
nkorange
|
1ca8a65234
|
Fix naming client throws exception when the service contains empty instance list.
|
2018-09-17 19:39:00 +08:00 |
|
mercyblitz
|
05b5425d59
|
Merge Other APIs
|
2018-09-14 15:31:19 +08:00 |
|
water.lyl
|
fdab9b7991
|
[motify info] file exist , then delete
|
2018-09-13 21:36:25 +08:00 |
|
water.lyl
|
8c7dcd7bb3
|
[motify info] config health info
|
2018-09-13 17:55:53 +08:00 |
|
water.lyl
|
89c5c8fd76
|
[motify info] Resolve code conflicts
|
2018-09-13 17:23:04 +08:00 |
|
water.lyl
|
de1d976432
|
Merge remote-tracking branch 'origin/0.3.0' into v0.2
* origin/0.3.0: (32 commits)
[modify info] restruct equal name to void conflict
[motify info] fix pmd
[motify info] Api split
fix bug and change some input style
fix: modify wrong code
[motify info] fix rollback problem
update code
[motify info] push web ui,and build shell
gitignore add build dir
fix: setParams decode bug
[motify info] push static result
[motify info] fix edit info
[motify info] push build result,and fix namespace undefined problem
fix tags bug
update add index.css
[motify info] mix useful
[motify info] push core ui
feat: add i18n feature
替换白底logo
update: update header css
...
|
2018-09-13 15:48:24 +08:00 |
|
nkorange
|
8d095f5011
|
Update get server status method
|
2018-09-13 15:31:48 +08:00 |
|
nkorange
|
4bc2b1fa97
|
Update server health method name
|
2018-09-13 14:18:42 +08:00 |
|
water.lyl
|
8719aea7c7
|
[motify info] Api split
|
2018-09-13 11:30:25 +08:00 |
|
nkorange
|
8b295159d1
|
Add server healthy method
|
2018-09-12 15:19:05 +08:00 |
|
nkorange
|
899bee7ae7
|
1. Support get all services from client; 2. Refactor dom class
|
2018-09-11 18:04:02 +08:00 |
|
nkorange
|
84df9affb7
|
Fix #35
|
2018-08-31 07:46:43 +08:00 |
|
nkorange
|
ffa921b217
|
Fix pmd error
|
2018-08-05 08:34:25 +08:00 |
|
nkorange
|
a8ead77f6f
|
Fix beat task never execute bug
|
2018-08-03 09:09:52 +08:00 |
|
javartisan
|
e44c420e74
|
update the variable name in the method description
|
2018-08-02 09:53:40 +08:00 |
|
xingxuechao
|
91d20f34fd
|
nacos is coming
|
2018-07-21 00:27:23 +08:00 |
|