Commit Graph

34 Commits

Author SHA1 Message Date
nkorange
93246b3ded Merge branch 'naming-model-refactor' into develop
# Conflicts:
#	console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigEditor/ConfigEditor.js
#	console/src/main/resources/static/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
#	naming/src/main/java/com/alibaba/nacos/naming/misc/NetUtils.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
2018-11-16 19:59:15 +08:00
Fury Zhu
ea03905ae9
Merge branch 'master' into naming-model-refactor 2018-11-16 18:16:51 +08:00
nkorange
46c141900e Fix PMD 2018-11-16 12:07:25 +08:00
hxy1991
af21897608 correct license 2018-11-16 10:28:28 +08:00
nkorange
361ae0b2dd Fix raft publish bug 2018-11-15 14:19:08 +08:00
hxy1991
de4a523318 Fixes #272 2018-11-14 12:02:19 +08:00
yanlinly
30919083e8
Merge pull request #247 from hxy1991/master
[ISSUE #222] [ISSUE #231] [ISSUE #246]
2018-11-12 10:49:32 +08:00
Fury Zhu
724ced4861
Merge pull request #213 from paderlol/develop
Fixes #193
2018-11-11 23:08:01 +08:00
hxy1991
0d90d6e895 Fixes #222 #231 2018-11-07 18:20:09 +08:00
water.lyl
7fdd80cc31 update version to 0.4.0 2018-11-05 20:34:37 +08:00
zhanglong
1f6271e1a1 support hostname for server cluster 2018-11-03 16:08:14 +08:00
nkorange
aa7e2e41e7 remove ip use weak raft 2018-10-30 16:16:01 +08:00
xuechaos
077c4cdb6f release Nacos 0.3.0, update version to 0.3.0 2018-10-26 21:55:05 +08:00
xuechaos
1fbcf24521 update 0.3.0-RC1 uppercase letter 2018-10-19 18:36:29 +08:00
nkorange
534995a405 Resolve conflicts 2018-10-18 18:59:45 +08:00
mercyblitz
08af83caac Polish alibaba/nacos#95 : more generic implementation 2018-10-02 12:22:18 +08:00
mercyblitz
adaf5f54d1 Polish alibaba/nacos#95 : add "standalone" profile 2018-10-02 11:20:54 +08:00
mercyblitz
64c6189ccb Polish alibaba/nacos#105 : add test cases 2018-10-01 23:10:21 +08:00
mercyblitz
c0a25c148a Polish alibaba/nacos#105 2018-10-01 22:54:37 +08:00
mercyblitz
dc7a4eaa85 Polish alibaba/nacos#102 2018-10-01 11:34:36 +08:00
mercyblitz
be8f3c2052 Polish alibaba/nacos#103 2018-10-01 10:58:27 +08:00
mercyblitz
a718c84d4c Polish alibaba/nacos#104 2018-10-01 10:48:34 +08:00
mercyblitz
b0b7146a86 Remove unused class 2018-10-01 10:30:24 +08:00
mercyblitz
85df9e077f Fixed alibaba/nacos#98 2018-09-30 16:41:40 +08:00
nkorange
44cf03db2d Update version to 0.2.1 2018-09-27 14:22:19 +08:00
nkorange
adafaf7086 Merge branch 'master' into 0.2.2 2018-09-26 21:20:22 +08:00
xuechaos
d24f8680d9 fix mvn -B clean apache-rat:check
close #79
2018-09-26 20:05:17 +08:00
nkorange
b54a0a9b9d Update version to 0.2.2-SNAPSHOT 2018-09-21 16:46:49 +08:00
hxy1991
357702afaa Modify the version to 0.2.1-RC1 2018-09-21 15:46:53 +08:00
xuechaos
b5fe4fd434 client jdk support 1.6 and del unuse file 2018-09-19 22:18:31 +08:00
mercyblitz
1145260d64 Update 0.2.1 and refactor some APIs 2018-09-15 13:50:25 +08:00
nkorange
6bc052153d Update version to 0.2.0 2018-09-12 14:13:38 +08:00
nkorange
84df9affb7 Fix #35 2018-08-31 07:46:43 +08:00
xingxuechao
91d20f34fd nacos is coming 2018-07-21 00:27:23 +08:00