Commit Graph

416 Commits

Author SHA1 Message Date
huangyonghui
b67956f0b4 add only digit and dot char for ip validation 2019-04-23 10:28:36 +08:00
Albert-Hugo
e6f82a940e remove useless validate code 2019-04-20 10:35:01 +08:00
huangyonghui
2cb387892a to support registering instance with host name 2019-04-19 11:52:15 +08:00
Fury Zhu
96e8e142f9
Merge pull request #1067 from paulzhangcc/feature-fix-1036
fix-1036
2019-04-16 15:55:48 +08:00
nkorange
a87cc12d47 Update version to 1.0.0 2019-04-15 20:01:34 +08:00
paulzhangcc
1a41ab6cfb fix-1036 :获取真正的GroupName,并设置.替代默认值 2019-04-15 18:17:41 +08:00
nkorange
699bdcb6dc Update to 1.0.0-SNAPSHOT 2019-04-15 16:36:10 +08:00
peachyy
67b7fc3497
Merge branch 'develop' into master 2019-04-15 14:10:38 +08:00
nkorange
eca0ea5760 Add log 2019-04-15 10:49:41 +08:00
得少
427a746e82 change the default value of isUseEndpointParsingRule from false to true 2019-04-12 12:49:46 +08:00
peachyy
2119aa1bdd add testcase 2019-04-11 14:46:08 +08:00
nkorange
ec7c119a72 Fix test case error 2019-04-11 00:09:14 +08:00
nkorange
3c1c98aaf1 Update version to 1.0.0 2019-04-10 22:04:27 +08:00
Fury Zhu
3d94644eb4
Merge pull request #1043 from alibaba/hotfix_recognize_080_data
Hotfix recognize 080 data
2019-04-10 21:07:40 +08:00
nkorange
278aa7eb31 Fix #923 2019-04-10 20:10:55 +08:00
nkorange
8d9b91e712 Fix #1041 2019-04-10 20:03:52 +08:00
nkorange
857f9bd15e Fix #1033 2019-04-10 11:29:05 +08:00
nkorange
026c430512 Fix #1029 2019-04-09 19:56:48 +08:00
nkorange
cab10aa914 Merge branch 'master' into develop
# 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
#	pom.xml
#	test/pom.xml
2019-04-09 16:30:03 +08:00
dungu.zpf
de26e2a8f9 #502 Modify default dispatch thread count 2019-04-09 15:44:50 +08:00
dungu.zpf
f3b13702b1 #502 Fix bug 2019-04-09 15:40:52 +08:00
nkorange
5754851b7e Fix #1008 2019-04-04 13:22:05 +08:00
pbting
b7a1fb22b3
Merge branch 'develop' into develop 2019-04-03 19:08:09 +08:00
得少
eca7a9a422 support parsing endpoint rule 2019-04-03 18:31:27 +08:00
nkorange
35edfd4383 #961 init cluster after instantiate cluster 2019-04-03 17:07:18 +08:00
nkorange
2cb96d1208 #923 Recognize 'cluster' 2019-04-03 11:52:33 +08:00
nkorange
4dc40311e6 Update version to 1.0.0-RC3 2019-04-03 10:43:08 +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
nkorange
210af3980c #502 Update switch name 2019-04-02 20:37:28 +08:00
nkorange
d8b768b8a7 #502 Check if key blank before instantiate new list. 2019-04-02 19:46:24 +08:00
xuechaos
178b80ea41 del warnings spotbugs-annotations #981 2019-04-01 21:16:14 +08:00
nkorange
51dd3db7c3 #502 Fix client beat bug 2019-04-01 14:31:02 +08:00
nkorange
12c032cb98 #502 Fix raft publish bug 2019-04-01 11:38:10 +08:00
nkorange
2c7daa654e Fix #948 2019-04-01 11:34:28 +08:00
Andy
180f3a73b2 Add unit test cases 2019-03-29 22:44:08 +08:00
Andy
1f125c4af3 Fix the issue: ArrayIndexOutOfBoundsException may be thrown when invokes taskDispatcher.addTask 2019-03-29 22:18:53 +08:00
nkorange
bb27800bbd #502 Fix remove service failed bug 2019-03-27 20:53:01 +08:00
nkorange
14ecd9c230 #502 Fix data inconsistent bug 2019-03-26 14:07:06 +08:00
nkorange
e2a720640a Fix #961 2019-03-26 11:55:48 +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
nkorange
de25dc844d Add namespace info in log 2019-03-25 14:16:29 +08:00
nkorange
e4579c9c0f #923 Add client beat method 2019-03-25 11:37:18 +08:00
nkorange
d5dc3e5747 #502 Support delete service in AP mode 2019-03-22 20:42:00 +08:00
nkorange
dc51aa5703 Merge branch 'hotfix_server_mode' into develop 2019-03-22 17:31:36 +08:00
nkorange
fcf968c36b Update version to 1.0.0-RC2 2019-03-22 17:29:26 +08:00
Fury Zhu
cb5eb8afe3
Merge pull request #953 from alibaba/hotfix_server_mode
Hotfix server mode
2019-03-22 17:16:59 +08:00
nkorange
18b6523b62 Fix #923 2019-03-22 17:04:07 +08:00
nkorange
da757f156c Fix #938 2019-03-22 16:58:46 +08:00
nkorange
9b24b46f7a Fix #946 2019-03-22 12:39:30 +08:00
Fury Zhu
cde0928ec8
Merge branch 'master' into hotfix_default_server_mode 2019-03-21 09:12:00 +08:00
nkorange
81bbbe6e56 #745 Modify default server mode 2019-03-21 09:04:19 +08:00
nkorange
7303ea7b66 #745 Remove server mode 2019-03-20 18:08:36 +08:00
nkorange
f6ea5042c8 #502 Refactor 2019-03-19 11:03:31 +08:00
nkorange
52d4e01bc7 #502 Fix several bugs 2019-03-18 20:57:28 +08:00
nkorange
3f2d704691 Fix #923 2019-03-18 20:03:08 +08:00
peachyy
c83fa78c17
Update RaftProxy.java
optimize imports
2019-03-18 17:13:09 +08:00
nkorange
df7278a846 #502 Fix url too long problem. 2019-03-17 15:36:51 +08:00
nkorange
7ca6143550 #502 Fix concurrent problem. 2019-03-16 20:07:04 +08:00
nkorange
488075fa52 Update version to 1.0.0-RC1 2019-03-15 15:48:30 +08:00
nkorange
99513a2fe8 #502 Support NONE healthChecker deserialize 2019-03-15 15:36:17 +08:00
nkorange
592f2b4301 #502 Add NONE healthChecker 2019-03-15 15:08:01 +08:00
nkorange
7bf60c18e7 #757 Remove DOM 2019-03-15 14:19:36 +08:00
nkorange
27622664e1 #502 Fix bug 2019-03-15 14:10:16 +08:00
nkorange
6034bdbdb9 #502 Compatible with 0.8.0 2019-03-14 16:04:07 +08:00
nkorange
f0c71e6d8b #502 fix bug 2019-03-13 18:41:00 +08:00
nkorange
08159d84e1 #502 fix bug 2019-03-12 18:12:30 +08:00
nkorange
ecc52cdfd7 #651 keep some methods 2019-03-11 20:28:41 +08:00
nkorange
5f07ce99e4 Fix #869 2019-03-11 17:32:52 +08:00
nkorange
8d28958cb7 #629 Fix bug 2019-03-08 17:18:01 +08:00
nkorange
fb8cf7d3b6 Fix config name error 2019-03-08 10:24:46 +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
nkorange
4704200f87 #839 Rest of methods refactored. 2019-03-07 17:59:08 +08:00
nkorange
82ec466a8b #629 refactor warm up 2019-03-07 14:51:14 +08:00
nkorange
bf2f6111d8 Fix #865 2019-03-06 20:57:10 +08:00
nkorange
79f83f3a67 #502 Refactor warm up 2019-03-06 17:01:25 +08:00
nkorange
d477bbce7c #502 validate instance format 2019-03-06 12:00:01 +08:00
nkorange
160f4f840b #502 filter refactor 2019-03-05 21:17:36 +08:00
nkorange
c9ab9e7904 #269 fix bug 2019-03-05 17:47:57 +08:00
nkorange
349ea927c9 #502 fix bug 2019-03-05 17:05:24 +08:00
nkorange
a4155fd939 #269 fix test case bug 2019-03-05 15:58:51 +08:00
nkorange
7947fc29b1 #269 fix bug 2019-03-05 14:54:53 +08:00
nkorange
116e9119c2 #269 fix send client beat bug 2019-03-05 11:35:58 +08:00
nkorange
9cb683e15d #502 Fix filter bug 2019-03-05 10:41:04 +08:00
nkorange
f1732927ae #502 Add licence 2019-03-05 09:20:54 +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
af26af7e6e #502 fix bug 2019-03-04 11:24:41 +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
nkorange
39f63f3721 #502 fix method name error 2019-03-04 09:42:13 +08:00
xuechaos
80c260e207 Release 0.9.0 Nacos : Nacos server function mode and fix 13 issues
* [#840] Nacos server adds startup mode to distinguish between config and naming.
* [#762] Register instance returns failed when the health check mode is 'server' in standalone mode.
* [#473] Nacos Cluster Mode kubernate Startup nacos.log error Log.
* [#240] Log strong dependence problem.
* [#824] getServicesOfServer throws exception if service list is empty.
* [#802] Nacos server multi-boot mode support.
* [#800] Nacos's client-to-server addressing mode document introduction.
* [#768] The interval at which the heartbeat is sent in BeatReactor is not controlled by the server return value.
* [#759] why instance can't auto-delete.
* [#756] Format of instance and service should be validated.
* [#720] Memory leak in PushService.
* [#653] IoUtils under nacos-common-0.2.1-RC1.jar lacks "" judgment on encoding.
* [#588] Client compatible to jdk1.6. On branch develop
2019-03-01 00:46:50 +08:00
xxc
f62c66e5ab
Merge pull request #833 from systp/master
Align attribute name
2019-02-28 15:42:31 +08:00
Fury Zhu
1e1e1beeb4
Merge pull request #810 from luoxn28/master
signalPublish with not STANDALONE_MODE
2019-02-28 14:16:19 +08:00
kaitai.zj
718ec5a5b2 #821 Registering instance should update valid (health) 2019-02-28 10:53:51 +08:00
nkorange
eb4cd017aa #839 rename update switch method 2019-02-28 10:48:20 +08:00
Fury Zhu
1f7c2f9a7a
Merge pull request #823 from nanamikon/issues-821
Registering instance should update valid (health)
2019-02-27 22:39:02 +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
尼古拉斯丶谭鹏
f6527edba1 Since you want to align, you are all aligned. 2019-02-26 15:32:29 +08:00