Commit Graph

1313 Commits

Author SHA1 Message Date
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
968a69c260
Merge pull request #1151 from jifengnan/develop
[ISSUE #1150] Correct the Relationship between Services and Clusters
2019-05-08 08:22:25 +08:00
Andy
8e29a348a9 Deleted the chinese comments 2019-05-07 21:24:57 +08:00
Fury Zhu
73ebb86055
Merge pull request #1170 from ddatsh/master
fix typo
2019-05-07 17:52:07 +08:00
Fury Zhu
e9d10d83e9
Merge pull request #1181 from mingyixu/master
collation and analysis of the ignore test cases
2019-05-07 17:31:00 +08:00
xiaochun.xxc
effb66c386 梳理nacos集测ignore用例 2019-05-07 16:05:41 +08:00
peter zhang
eef6e73d94
fix typo
motify > modify
2019-05-06 15:25:02 +08:00
Andy
4fd773b534 Rollback to use NamingUtils to grab service name and group name 2019-05-04 21:06:31 +08:00
Fury Zhu
0ebc68c3ac
Merge pull request #1159 from alibaba/hotfix_server_list_inconsistent
Hotfix server list inconsistent
2019-04-30 17:23:27 +08:00
nkorange
3d684b6f56 Fix #1091 2019-04-30 16:18:35 +08:00
Andy
312b75bc1b Add licence info 2019-04-30 00:35:59 +08:00
Andy
22a2969593 1. 修正服务和集群之间的关系(Correct the relationship between the service and cluster)
2. 创建集群时必须提供名字和所属服务(The name and the service are required to create a cluster)
3. 修正UtilsAndCommons.shakeUp的注释
2019-04-30 00:14:51 +08:00
Fury Zhu
fdcd379371
Merge pull request #1101 from Albert-Hugo/feature-naming-event
[#1075]  NamingEvent add getGroupName and getClusters method
2019-04-28 19:26:48 +08:00
LoadChange
c9a5134de5 fix: group form validation 2019-04-28 14:41:11 +08:00
huangyonghui
35f3842d1c format code 2019-04-26 16:59:18 +08:00
huangyonghui
3ebff069a3 Merge branch 'develop' into feature-naming-event 2019-04-24 15:14:09 +08:00
huangyonghui
8ac94b61b4 NamingEvent add getGroupName and getClusters method 2019-04-24 15:08:16 +08:00
Fury Zhu
1cfd8a5709
Merge pull request #1079 from Albert-Hugo/feature_host_name_ip
[ISSUE #963] to support registering instance with host name
2019-04-23 16:28:36 +08:00
Fury Zhu
2f766c5c2d
Merge pull request #1095 from alibaba/feature_naming_group
Feature naming group
2019-04-23 16:26:36 +08:00
huangyonghui
b67956f0b4 add only digit and dot char for ip validation 2019-04-23 10:28:36 +08:00
Albert-Hugo
c896e370f1 Merge remote-tracking branch 'upstream/develop' into feature_host_name_ip 2019-04-20 10:38:03 +08:00
Albert-Hugo
e6f82a940e remove useless validate code 2019-04-20 10:35:01 +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
huangyonghui
2cb387892a to support registering instance with host name 2019-04-19 11:52:15 +08:00
xiaochun.xxc
808ddae799 add ignore flag 2019-04-19 10:20:30 +08:00
xiaochun.xxc
f002675af1 add cmdb testcases 2019-04-18 23:06:27 +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
Fury Zhu
96e8e142f9
Merge pull request #1067 from paulzhangcc/feature-fix-1036
fix-1036
2019-04-16 15:55:48 +08:00
Fury Zhu
fceff72272
Merge pull request #1070 from alibaba/hotfix_increase_url_length_limit
#1069 Increase the URL length limit for temporary solution
2019-04-16 10:06:27 +08:00
nkorange
703dc0d2f6 #1069 Increase the URL length limit for temporary solution 2019-04-16 09:49:42 +08:00
Fury Zhu
bfe5a7a831
Merge pull request #1068 from alibaba/develop
Develop
2019-04-15 20:10: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
295b4de3e7 Remove config 2019-04-15 16:36:44 +08:00
nkorange
699bdcb6dc Update to 1.0.0-SNAPSHOT 2019-04-15 16:36:10 +08:00
nkorange
053f3a0b26 Merge branch 'develop' of https://github.com/alibaba/nacos into develop 2019-04-15 14:49:17 +08:00
Fury Zhu
fa3a1ccab1
Merge pull request #1049 from peachyy/master
add testcase
2019-04-15 14:25:08 +08:00
peachyy
67b7fc3497
Merge branch 'develop' into master 2019-04-15 14:10:38 +08:00
nkorange
18f714775b Merge branch 'master' into develop
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
2019-04-15 11:23:22 +08:00
nkorange
eca0ea5760 Add log 2019-04-15 10:49:41 +08:00
Fury Zhu
ffa1da871d
Merge pull request #1039 from sofior/master
console 里的public首字母是大写的和命名空间里那个保留控件不一致
2019-04-14 00:05:31 +08:00
Fury Zhu
85212d4a09
Merge pull request #1053 from pbting/develop
change the default value of isUseEndpointParsingRule
2019-04-12 12:59:51 +08:00
pbting
9b09d48b6b Merge branch 'develop' of https://github.com/pbting/nacos into develop 2019-04-12 12:50:16 +08:00
得少
427a746e82 change the default value of isUseEndpointParsingRule from false to true 2019-04-12 12:49:46 +08:00
得少
ddd19dac35 change the default value of isUseEndpointParsingRule from false to true 2019-04-12 10:15:54 +08:00
pbting
31b91e68b0
Merge pull request #6 from alibaba/develop
Develop
2019-04-11 22:21:39 +08:00
peachyy
2119aa1bdd add testcase 2019-04-11 14:46:08 +08:00
Fury Zhu
f7142c1151
Merge pull request #1046 from alibaba/hotfix_test_case_error
Fix test case error
2019-04-11 11:09:03 +08:00
Fury Zhu
dc4f10952d
Merge branch 'master' into hotfix_test_case_error 2019-04-11 10:56:12 +08:00
yanlinly
5037467014
Merge pull request #1047 from yanlinly/master
fix namespace is null problem
2019-04-11 09:38:51 +08:00