Commit Graph

560 Commits

Author SHA1 Message Date
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
nkorange
bbc3c24226 Use HTTP redirect instead of resend request 2018-11-05 17:09:00 +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
zhanglong
713fe2e635 Merge branch 'develop' of https://github.com/paderlol/nacos into develop 2018-11-03 16:10:20 +08:00
zhanglong
1f6271e1a1 support hostname for server cluster 2018-11-03 16:08:14 +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
a020bcd783 #177 Finish backend. 2018-10-31 21:16:55 +08:00
nkorange
1a9a282682 #176 Bypass local cache at client start by default. 2018-10-31 17:14:17 +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
nkorange
ad36fba84b Enable default TTL 2018-10-31 15:21:15 +08:00
nkorange
4ff38aca3a Differentiate temporary data and persistent data 2018-10-31 10:48:15 +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
3e01285ab7 Merge branch 'hotfix-clientbeat-lose-info' into raft-performance 2018-10-30 20:11:30 +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
nkorange
aa7e2e41e7 remove ip use weak raft 2018-10-30 16:16: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
ceb2787944 Merge branch 'hotfix-register-hangs' into raft-performance
# Conflicts:
#	api/pom.xml
#	client/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
2018-10-30 08:54:50 +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
nkorange
6466218baf Raft performance improved. 2018-10-29 20:34:12 +08:00
zhichen
4cf9ca0998 modulize the global params of fe 2018-10-29 17:48:14 +08:00
yanlinly
b0a69c4479
Merge pull request #1 from alibaba/develop
Develop
2018-10-29 16:53:47 +08:00
xuechaos
077c4cdb6f release Nacos 0.3.0, update version to 0.3.0 2018-10-26 21:55:05 +08:00
xxc
04a4f3555b
Merge pull request #178 from alibaba/0.3.0
0.3.0
2018-10-26 21:39:04 +08:00
xuechaos
c32fbd9f65 update lisence header 2018-10-26 21:02:33 +08:00
xuechaos
1583369a7b 0.3 merge master 2018-10-26 20:32:04 +08:00
xuechaos
2a2a53398f Merge branch 'master' into 0.3
# Conflicts:
#	console/src/main/resources/static/i18ndoc.js
#	console/src/main/resources/static/index.js
2018-10-26 20:27:33 +08:00
water.lyl
82781bbbe3 Fix #171
build js
2018-10-26 19:26:16 +08:00
zhichen
b97d0b4b69 Merge branch '0.3.0' of https://github.com/alibaba/nacos into 0.3.0 2018-10-26 18:57:08 +08:00
zhichen
91cc27a0cc fix #171 2018-10-26 18:56:30 +08:00