Commit Graph

369 Commits

Author SHA1 Message Date
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
water.lyl
dcddd2c5d4 Fix #228 build js 2018-11-07 13:16:21 +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
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
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
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
yangyshdan
54f67c8906 Merge branch 'develop' of https://github.com/alibaba/nacos 2018-11-05 18:15:48 +08:00
Asa
61678e2f52
Merge pull request #218 from loadchange/feature_console_create_service
Fix a bug in PR #211
2018-11-05 18:08:44 +08:00
王彦民
5cc9ca9b7c fix: Delete refresh table 2018-11-05 17:32:10 +08:00
yanlinly
6d0eb73d46
Merge pull request #217 from yanlinly/master
Fix #216
2018-11-05 15:57:01 +08:00
water.lyl
db8e97bd35 Fix #216 2018-11-05 15:45:36 +08:00
zhichen
56e2251612
Merge pull request #211 from loadchange/feature_console_create_service
#177 Finish EF
2018-11-04 14:31:22 +08:00
hxy1991
53147b3420 Fixes #210 2018-11-02 18:44:57 +08:00
hxy1991
7c626eb4f8 Fixes #92 2018-11-02 18:26:24 +08:00
zhichen
2181ff170c build js 2018-11-02 17:03:21 +08:00
王彦民
f462f46706 #177 Finish EF 2018-11-02 10:38:43 +08:00
yangyshdan
ce0c36dbd0
Merge pull request #158 from alibaba/improve-readme.md
Add more information in README.md to reflect the echosystem, fix [ISSUE #157],
2018-11-02 09:58:15 +08:00
yanlinly
6cddbc6b00
Merge pull request #201 from yanlinly/master
Fix #200
2018-10-31 22:22:03 +08:00
water.lyl
224aecf6c7 Fix #200 timeout should be 5 2018-10-31 22:18:48 +08:00
water.lyl
8a7d313771 Fix #200 2018-10-31 22:17:02 +08:00
nkorange
50be11d0ef Fix #197 2018-10-31 15:48:24 +08:00
nkorange
6e3f2ba31a Merge branch 'master' into develop 2018-10-31 15:42:23 +08:00
xxc
eab2110033
Merge pull request #192 from alibaba/hotfix-clientbeat-lose-info
Fix #190
2018-10-31 15:30:17 +08:00
xxc
1a94626a0a
Merge pull request #184 from alibaba/hotfix-register-hangs
Fix #150
2018-10-31 15:23:43 +08:00
yanlinly
fa54918da1
Merge pull request #2 from alibaba/develop
Develop
2018-10-31 10:02:29 +08:00
yanlinly
0add80d700
Merge pull request #183 from jameslcj/feature_fe_module_gloablLib
modulize the global params of fe
2018-10-31 09:43:50 +08:00
yanlinly
24a2ede65f
Merge pull request #194 from yanlinly/master
Fix #38 #106 #188
2018-10-31 09:39:22 +08:00
Keep
ede4111300
Merge pull request #152 from hxy1991/master
fixes #92
2018-10-30 21:16:09 +08:00
nkorange
dc7cb2bdee Fix #190 2018-10-30 17:59:05 +08:00
water.lyl
563105ae4f Fix #106 2018-10-30 17:52:01 +08:00
water.lyl
9d70f720ca Fix #188 2018-10-30 15:55:06 +08:00
water.lyl
70651a89a7 Fix #38 2018-10-30 11:06:55 +08:00
nkorange
ebb5cddd84 Not remove lock 2018-10-29 22:34:44 +08:00
nkorange
25f219623c Fix #150 2018-10-29 21:25:53 +08:00