Commit Graph

903 Commits

Author SHA1 Message Date
nkorange
0e0900bfa9 #677 Add ephemeral instance implementation 2019-01-24 16:56:51 +08:00
nkorange
a77076ae11 Merge branch 'master' into feature_naming_ap
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
2019-01-23 16:23:50 +08:00
Fury Zhu
db9489b9c2
Merge pull request #689 from alibaba/hotfix_ip4Dom2_dom_parse_error
Fix #688
2019-01-23 16:13:43 +08:00
nkorange
5a68d60a10 Fix #688 2019-01-23 15:57:44 +08:00
nkorange
6ebde678d3 #502 Reorganize parameter mapping. 2019-01-23 15:33:20 +08:00
nkorange
19b785b20d Merge branch 'develop' into feature_naming_ap
# 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
#	naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/RaftController.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	pom.xml
#	test/pom.xml
2019-01-23 13:50:02 +08:00
Fury Zhu
5f537c5a4d
Merge pull request #685 from alibaba/develop
Develop
2019-01-23 12:08:33 +08:00
nkorange
bef5407022 Merge remote-tracking branch 'origin/develop' into develop 2019-01-23 11:58:43 +08:00
nkorange
ab60c19e89 #498 fix parameter not decoded bug 2019-01-23 11:58:31 +08:00
yanlinly
ffb8720820
Merge pull request #683 from alibaba/develop
Release 0.8
2019-01-22 22:29:05 +08:00
water.lyl
f29209b114 release 0.8 2019-01-22 22:16:13 +08:00
LoadChange
b213be7fe9 fix: protectThreshold validator 2019-01-22 21:49:02 +08:00
nkorange
d850ceefb0 #498 fix bug 2019-01-22 21:46:52 +08:00
nkorange
cee461437a #498 fix bug 2019-01-22 21:34:07 +08:00
nkorange
58acdb1bf8 #651 Remove APICommands 2019-01-22 20:55:11 +08:00
nkorange
0eb0e173aa Merge branch 'develop' into feature_naming_ap
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
2019-01-22 17:14:31 +08:00
Fury Zhu
742d1d757e
Merge pull request #679 from alibaba/feature_compatible_for_old_dns_client
Close #678
2019-01-22 17:05:49 +08:00
nkorange
54d4dce869 Close #678 2019-01-22 16:47:33 +08:00
nkorange
cd8f079609 Merge branch 'develop' into feature_naming_ap
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
2019-01-22 15:58:51 +08:00
nkorange
55178a6b2c #498 Fix bug 2019-01-22 15:43:23 +08:00
nkorange
bc4d4d3c8d #502 Partition Protocol develop finished 2019-01-22 14:33:58 +08:00
water.lyl
fc5db210bb Fix #639 fix namespace desc problem 2019-01-22 12:38:06 +08:00
LoadChange
d37228caef fix: new config width 2019-01-22 11:26:40 +08:00
yanlinly
21c157f548
Merge pull request #673 from ankeway/hotfix_672
Hotfix 672
2019-01-22 10:57:51 +08:00
nkorange
cc9b6b58b7 Merge branch 'develop' into feature_naming_ap 2019-01-22 10:13:22 +08:00
nkorange
1e9d9e2a85 Fix HTTP method value error 2019-01-22 10:08:49 +08:00
water.lyl
25ad3ff696 Fix #339 Project language problem identified in github 2019-01-22 10:02:01 +08:00
water.lyl
e6f07b2db0 Fix #381 add encode password tool 2019-01-22 09:53:54 +08:00
water.lyl
9947e8565c change default user/password to nacos/nacos 2019-01-22 09:42:25 +08:00
ankeway
308bae547d hotfix_672 2019-01-22 09:28:13 +08:00
nkorange
257f54a50b #502 Refactor data model 2019-01-21 19:26:26 +08:00
LoadChange
79874b26d6 Update fe build 2019-01-21 18:43:49 +08:00
LoadChange
73c98d3541 fix: closes #640, #648 2019-01-21 18:43:49 +08:00
LoadChange
59fd26abaa Update fe build 2019-01-21 18:43:49 +08:00
LoadChange
fdd4521a64 fix: Menu status 2019-01-21 18:43:49 +08:00
LoadChange
aafd30eb2b fix: newconfig style 2019-01-21 18:43:49 +08:00
Fury Zhu
95c3458fed
Merge pull request #669 from alibaba/feature_multi_tenant
Fix #668
2019-01-21 15:09:26 +08:00
nkorange
a72467e077 Merge branch 'feature_multi_tenant' into feature_naming_ap
# Conflicts:
#	console/src/main/resources/META-INF/nacos-default.properties
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
2019-01-21 15:06:00 +08:00
nkorange
3f6c56f81c Fix #668 2019-01-21 14:51:37 +08:00
nkorange
e9ddfd7e29 #502 Receive data sync 2019-01-21 14:28:59 +08:00
yanlinly
a63910940a
Merge pull request #666 from wfnuser/enhancement/login-ui-enhancement
fix the style
2019-01-21 14:18:47 +08:00
wfnuser
bd063d283d fix the style 2019-01-21 14:10:47 +08:00
Fury Zhu
ad4f63ebe4
Merge pull request #664 from paderlol/develop
Fix update instance info NPE #663
2019-01-20 22:04:57 +08:00
zhanglong
25e4b86755 Fix update instance info NPE #663 2019-01-20 21:49:20 +08:00
nkorange
330fc4e6dc #502 Partition consistency start coding 2019-01-20 20:55:43 +08:00
nkorange
f2b43fb240 #502 Update author information 2019-01-19 21:23:35 +08:00
nkorange
bf80ff1622 #650 Add ServerListManager 2019-01-19 18:24:50 +08:00
pader
6963301441
Merge pull request #2 from alibaba/develop
merge latest code
2019-01-19 12:04:11 +08:00
TsingLiang
04f067b86d
Merge pull request #652 from alibaba/feature_metrics
Feature metrics
2019-01-18 20:42:43 +08:00
qingliang.ql
80bf9717cd add url 2019-01-18 14:26:32 +08:00