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 |
|
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 |
|
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 |
|
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 |
|
得少
|
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 |
|
nkorange
|
35edfd4383
|
#961 init cluster after instantiate cluster
|
2019-04-03 17:07:18 +08:00 |
|
Fury Zhu
|
539280c44b
|
Merge pull request #999 from alibaba/1.0.0-RC3
1.0.0 rc3
|
2019-04-03 12:13:39 +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 |
|
suxiaolin
|
73d13b51a2
|
fix typo 控件 => 空间
|
2019-04-03 10:32:11 +08:00 |
|
Fury Zhu
|
8e20fd6832
|
Merge pull request #987 from hxy1991/fix_986
Fixes #986
|
2019-04-03 10:26:44 +08:00 |
|
nkorange
|
2fe8a76c71
|
Fix console 401 error
|
2019-04-02 21:36:28 +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 |
|
yanlinly
|
acaee3ffb5
|
Merge pull request #993 from alibaba/del_warnings
Remove spotbugs-annotations dependency
|
2019-04-02 10:31:06 +08:00 |
|
xxc
|
ec8046ef0d
|
Merge pull request #991 from yanlinly/master
remove lgpl dependency
|
2019-04-01 23:36:02 +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 |
|
Keep
|
adcc955563
|
Merge pull request #985 from hxy1991/fix_984
Fixes #984
|
2019-04-01 14:36:17 +08:00 |
|
nkorange
|
51dd3db7c3
|
#502 Fix client beat bug
|
2019-04-01 14:31:02 +08:00 |
|
hxy1991
|
9c9050207e
|
Fixes #986
|
2019-04-01 11:48:53 +08:00 |
|
nkorange
|
12c032cb98
|
#502 Fix raft publish bug
|
2019-04-01 11:38:10 +08:00 |
|
hxy1991
|
df4f338a41
|
Fixes #984
|
2019-04-01 11:37:30 +08:00 |
|
nkorange
|
4dde5d6cfd
|
Merge remote-tracking branch 'origin/feature_naming_group' into feature_naming_group
|
2019-04-01 11:34:40 +08:00 |
|
nkorange
|
2c7daa654e
|
Fix #948
|
2019-04-01 11:34:28 +08:00 |
|