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 |
|
water.lyl
|
8175cd9aeb
|
namespace default empty
|
2019-04-11 00:58:06 +08:00 |
|
yanlinly
|
fbb57c4450
|
Merge pull request #7 from alibaba/develop
Develop
|
2019-04-11 00:41:45 +08:00 |
|
nkorange
|
ec7c119a72
|
Fix test case error
|
2019-04-11 00:09:14 +08:00 |
|
Fury Zhu
|
97ddd39b64
|
Merge pull request #1045 from alibaba/hotfix_test_case_error
Hotfix test case error
|
2019-04-10 22:56:21 +08:00 |
|
nkorange
|
18b8c95a71
|
Fix test case error
|
2019-04-10 22:44:38 +08:00 |
|
nkorange
|
ef257d56f5
|
Merge branch 'master' of https://github.com/alibaba/nacos
|
2019-04-10 22:15:25 +08:00 |
|
Fury Zhu
|
3041f0a9ba
|
Merge pull request #1044 from alibaba/develop
Develop
|
2019-04-10 22:14:54 +08:00 |
|
Fury Zhu
|
3b470fae3d
|
Merge branch 'master' into develop
|
2019-04-10 22:06:05 +08:00 |
|
nkorange
|
3c1c98aaf1
|
Update version to 1.0.0
|
2019-04-10 22:04:27 +08:00 |
|
nkorange
|
81a75334fc
|
Merge branch 'develop'
|
2019-04-10 21:09:25 +08:00 |
|
Fury Zhu
|
20a6a3b422
|
Merge pull request #1042 from alibaba/hotfix_recognize_080_data
Hotfix recognize 080 data
|
2019-04-10 21:07:59 +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 |
|
sofior
|
6cd77572a3
|
修改Public命令空间和console的大小写一致
|
2019-04-10 16:16:04 +08:00 |
|
Fury Zhu
|
d649106f81
|
Merge pull request #1034 from alibaba/hotfix_register_instance_idempotent
Fix #1033
|
2019-04-10 15:14:46 +08:00 |
|
nkorange
|
857f9bd15e
|
Fix #1033
|
2019-04-10 11:29:05 +08:00 |
|
Fury Zhu
|
3f58e94f06
|
Merge pull request #1030 from alibaba/hotfix_register_instance_idempotent
Fix #1029
|
2019-04-10 10:22:08 +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 |
|
Fury Zhu
|
6cfdf1063b
|
Merge pull request #1026 from alibaba/feature_dns
Feature dns
|
2019-04-09 16:13:48 +08:00 |
|
Fury Zhu
|
dd532ba230
|
Merge branch 'master' into feature_dns
|
2019-04-09 15:55:10 +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 |
|
xxc
|
a6f63bc7ec
|
Update README.md
update Contact for DingDing.
|
2019-04-09 15:09:52 +08:00 |
|
Fury Zhu
|
04797debed
|
Merge pull request #1009 from alibaba/hotfix_cluster_has_null_service
Fix #1008
|
2019-04-04 16:02:02 +08:00 |
|
Fury Zhu
|
047491b53c
|
Merge branch 'master' into hotfix_cluster_has_null_service
|
2019-04-04 13:47:04 +08:00 |
|
nkorange
|
5754851b7e
|
Fix #1008
|
2019-04-04 13:22:05 +08:00 |
|
SLKun
|
ce0b863e47
|
fixes #827
|
2019-04-04 11:37:16 +08:00 |
|
Fury Zhu
|
c5cf87ace5
|
Merge pull request #1006 from alibaba/hotfix_startup_debug_open
Update startup.sh
|
2019-04-04 11:10:41 +08:00 |
|
Fury Zhu
|
1837ea4450
|
Update startup.sh
|
2019-04-04 11:01:26 +08:00 |
|
Fury Zhu
|
53d154d6c3
|
Merge pull request #1002 from alibaba/hotfix_remove_service_failed
#961 init cluster after instantiate cluster
|
2019-04-04 10:40:35 +08:00 |
|
Fury Zhu
|
3602cd0601
|
Merge pull request #1004 from pbting/develop
support endpoint rule with parsing
|
2019-04-04 10:29:30 +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 |
|