Commit Graph

508 Commits

Author SHA1 Message Date
Fury Zhu
724ced4861
Merge pull request #213 from paderlol/develop
Fixes #193
2018-11-11 23:08:01 +08:00
zhanglong
d60c03edcd support domain for server cluster into k8s 2018-11-11 15:15:09 +08:00
hxy1991
cc9fa1f19c Fixes #222 2018-11-09 15:30:17 +08:00
Keep
e9e5e7a052
Merge pull request #248 from jun1st/master
Update README.md
2018-11-09 10:55:09 +08:00
Penn(PingGuo)
431ccc6fe1
Merge pull request #238 from alibaba/readme-develop
Enrich the content of CONTRIBUTING
2018-11-09 10:08:20 +08:00
xxc
1b99ce4f21
Merge pull request #250 from alibaba/hotfix_duplicate_parameter_enable
Fix #249
2018-11-09 02:10:02 +08:00
nkorange
24485abcf9 Fix #249 2018-11-08 21:28:20 +08:00
nkorange
8fe38f7dcb Fix #249 2018-11-08 21:24:50 +08:00
feng qijun
a9cfe0c77f
Update README.md
change to the latest release version 0.4.0
2018-11-08 20:26:36 +08:00
nkorange
6aaae5d95f Call local method instead of sending HTTP request to localhost 2018-11-08 19:50:34 +08:00
xxc
031f2f1a16
Merge pull request #244 from alibaba/hotfix_239
fix issue #239
2018-11-08 16:46:40 +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
yangyshdan
f6b39ed309 #166 2018-11-08 16:00:01 +08:00
hxy1991
2ded3cf2bd Fixes #246 2018-11-08 15:39:07 +08:00
hxy1991
915f984024 Merge branch 'upstream-develop' 2018-11-08 15:38:39 +08:00
Keep
cb4e863c54
Merge pull request #245 from alibaba/master
Merge branch 'master' into develop
2018-11-08 15:14:56 +08:00
pguo
8b6c07be42 fix issue #239 2018-11-08 14:18:28 +08:00
yangyshdan
6485eb069e
Update README.md
#166
2018-11-07 23:03:36 +08:00
yangyshdan
64b75ef3e1
Update CONTRIBUTING.md
#166
2018-11-07 23:00:26 +08:00
yangyshdan
1649378a4d
Update README.md
#166
2018-11-07 22:56:06 +08:00
yangyshdan
25ff1def94
Update CONTRIBUTING.md
#166
2018-11-07 22:51:59 +08:00
yangyshdan
1d8f5e1b2c
Create CODE_OF_CONDUCT.md
#166
2018-11-07 22:50:14 +08:00
yangyshdan
6a26a9d220
Update CONTRIBUTING.md
#166
2018-11-07 22:45:40 +08:00
yangyshdan
cfca827a14
Update README.md
#166
2018-11-07 22:07:56 +08:00
yangyshdan
26a58ea42c
Update README.md
fixes #166
2018-11-07 22:06:12 +08:00
yangyshdan
4c80ac2e8a
Update README.md
#166
2018-11-07 20:53:12 +08:00
hxy1991
0d90d6e895 Fixes #222 #231 2018-11-07 18:20:09 +08:00
water.lyl
dcddd2c5d4 Fix #228 build js 2018-11-07 13:16:21 +08:00
nkorange
d6f4834688 Separate locked publish from unlocked publish 2018-11-07 11:28:46 +08:00
Fury Zhu
d5eeb2f351
Merge pull request #228 from loadchange/hotfix_fe_rollback_service_list
FE rollback, service list
2018-11-07 10:46:05 +08:00
王彦民
5213dbea01 fix: fe rollback, service list 2018-11-07 10:35:24 +08:00
Fury Zhu
bdc3026798
Merge pull request #198 from alibaba/hotfix_update_service_error
Fix #197
2018-11-07 10:11:42 +08:00
Asa
d6f8b1b043
Merge pull request #226 from loadchange/hotfix_fe_rollback_service_list
fix: fe rollback, service list
2018-11-07 10:09:26 +08:00
王彦民
7b77ff6471 fix: fe rollback, service list 2018-11-07 10:06:22 +08:00
Fury Zhu
3cbcbe94c0
Merge pull request #220 from nanamikon/master
PUT /instance should use param key "useIPPort4Check" instead of "userIPPort4Check"
2018-11-06 11:42:27 +08:00
nkorange
c348398d45 Fix #168 2018-11-06 09:45:07 +08:00
yanlinly
f1d0ec4c0d
Merge pull request #221 from alibaba/develop
Release 0.4.0
2018-11-05 21:46:24 +08:00
yanlinly
9369f1819d
Merge branch 'master' into develop 2018-11-05 21:03:22 +08:00
yangyshdan
01a25eac47 Complementary fix for #166 2018-11-05 20:44:58 +08:00
yanlinly
608104c993
Merge pull request #212 from hxy1991/master
Fixes #92
2018-11-05 20:44:22 +08:00
nkorange
db2a6498b6 Fix #181 2018-11-05 20:42:14 +08:00
water.lyl
7fdd80cc31 update version to 0.4.0 2018-11-05 20:34:37 +08:00
hxy1991
72b298e872 Fixes #196 2018-11-05 20:29:45 +08:00
hxy1991
d347a1456e Merge branch 'upstream-develop' 2018-11-05 20:29:13 +08:00
water.lyl
b94e6fe6cd Fix #179 2018-11-05 19:40:06 +08:00
yangyshdan
8c9f24cefc Update readme.md for more related project repository information 2018-11-05 19:40:05 +08:00
yangyshdan
e62d2bf457 Solve #166 2018-11-05 19:38:32 +08:00
hxy1991
adc7ecfe48 Merge branch 'upstream-develop' 2018-11-05 18:29:23 +08:00
kaitai.zj
1a4c0e0550 bug fix: The key in the com.alibaba.nacos.api.naming.pojo.Cluster is "useIPPort4Check" instead of "userIPPort4Check" 2018-11-05 18:20:23 +08:00