diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca639f871..7cb1f3d56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.6.1(Dec, 2018)
+
+[#421] NamingService's serivce name can't use colon(:) in Windows
+[#432] When packing nacos-core, ${user.home} is replaced in the logback configuration file (nacos.xml)
+
## 0.6.0(Dec, 2018)
[#388] Cluster name should be provided in the Instance
diff --git a/README.md b/README.md
index a91e959a9..8b4c18b15 100644
--- a/README.md
+++ b/README.md
@@ -40,9 +40,9 @@ It is super easy to get started with your first project.
You can download the package from the [latest stable release](https://github.com/alibaba/nacos/releases).
-Take release nacos-server-0.6.0.zip for example.
+Take release nacos-server-0.6.1.zip for example.
```
-unzip nacos-server-0.6.0.zip
+unzip nacos-server-0.6.1.zip
cd nacos/bin
```
diff --git a/api/pom.xml b/api/pom.xml
index 9756bb165..65c8031be 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -16,7 +16,7 @@
com.alibaba.nacos
nacos-all
- 0.6.0
+ 0.6.1-SNAPSHOT
4.0.0
diff --git a/client/pom.xml b/client/pom.xml
index 53b1959cd..d1a0bd002 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -16,7 +16,7 @@
com.alibaba.nacos
nacos-all
- 0.6.0
+ 0.6.1-SNAPSHOT
../pom.xml
diff --git a/common/pom.xml b/common/pom.xml
index 7cdf938d9..e226b37c8 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -18,7 +18,7 @@
com.alibaba.nacos
nacos-all
- 0.6.0
+ 0.6.1-SNAPSHOT
../pom.xml
4.0.0
diff --git a/config/pom.xml b/config/pom.xml
index 44a5f1318..9ae6e39de 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -17,7 +17,7 @@
com.alibaba.nacos
nacos-all
- 0.6.0
+ 0.6.1-SNAPSHOT
4.0.0
diff --git a/console/pom.xml b/console/pom.xml
index a9be88585..cd58f3485 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -18,7 +18,7 @@
com.alibaba.nacos
nacos-all
- 0.6.0
+ 0.6.1-SNAPSHOT
nacos-console
diff --git a/console/src/main/resources/static/console-fe/src/i18ndoc.js b/console/src/main/resources/static/console-fe/src/i18ndoc.js
index 8c20956c4..ae005fc76 100644
--- a/console/src/main/resources/static/console-fe/src/i18ndoc.js
+++ b/console/src/main/resources/static/console-fe/src/i18ndoc.js
@@ -12,7 +12,7 @@
*/
module.exports = {
'zh-cn': {
- 'com.alibaba.nacos.layout.noenv.nacosversion': '0.6.0',
+ 'com.alibaba.nacos.layout.noenv.nacosversion': '0.6.1',
'com.alibaba.nacos.page.configurationManagementVirtual': '配置管理',
'com.alibaba.nacos.page.serviceManagementVirtual': '服务管理',
'nacos.component.ExportDialog.tags2': '标签:',
@@ -574,7 +574,7 @@ module.exports = {
'nacos.page.ConfigEditor.submit_failed': '不能为空, 提交失败',
},
'en-us': {
- 'com.alibaba.nacos.layout.noenv.nacosversion': '0.6.0',
+ 'com.alibaba.nacos.layout.noenv.nacosversion': '0.6.1',
'com.alibaba.nacos.page.configurationManagementVirtual': 'ConfigManagement',
'com.alibaba.nacos.page.serviceManagementVirtual': 'ServiceManagement',
'nacos.component.CloneDialog.the_same_configuration': 'Conflict:',
diff --git a/console/src/main/resources/static/console-fe/src/locales/en-US.js b/console/src/main/resources/static/console-fe/src/locales/en-US.js
index cbc45afe5..c63f7d7b9 100644
--- a/console/src/main/resources/static/console-fe/src/locales/en-US.js
+++ b/console/src/main/resources/static/console-fe/src/locales/en-US.js
@@ -21,7 +21,7 @@ const I18N_CONF = {
},
MainLayout: {
nacosName: 'NACOS',
- nacosVersion: '0.6.0',
+ nacosVersion: '0.6.1',
doesNotExist: 'The page you visit does not exist',
configurationManagementVirtual: 'ConfigManagement',
configurationManagement: 'Configurations',
diff --git a/console/src/main/resources/static/console-fe/src/locales/zh-CN.js b/console/src/main/resources/static/console-fe/src/locales/zh-CN.js
index bca7b585a..00b1216b0 100644
--- a/console/src/main/resources/static/console-fe/src/locales/zh-CN.js
+++ b/console/src/main/resources/static/console-fe/src/locales/zh-CN.js
@@ -21,7 +21,7 @@ const I18N_CONF = {
},
MainLayout: {
nacosName: 'NACOS',
- nacosVersion: '0.6.0',
+ nacosVersion: '0.6.1',
doesNotExist: '您访问的页面不存在',
configurationManagementVirtual: '配置管理',
configurationManagement: '配置列表',
diff --git a/core/pom.xml b/core/pom.xml
index 1c506063a..ca0edb1f3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -18,7 +18,7 @@
com.alibaba.nacos
nacos-all
- 0.6.0
+ 0.6.1-SNAPSHOT
../pom.xml
diff --git a/distribution/pom.xml b/distribution/pom.xml
index bef1c2c43..5577e6074 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -18,7 +18,7 @@
com.alibaba.nacos
nacos-all
- 0.6.0
+ 0.6.1-SNAPSHOT
../pom.xml
diff --git a/example/pom.xml b/example/pom.xml
index 65e11a166..597c38a19 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -18,7 +18,7 @@
com.alibaba.nacos
nacos-all
- 0.6.0
+ 0.6.1-SNAPSHOT
../pom.xml
diff --git a/naming/pom.xml b/naming/pom.xml
index 1d3137507..bcca6fc27 100644
--- a/naming/pom.xml
+++ b/naming/pom.xml
@@ -18,7 +18,7 @@
com.alibaba.nacos
nacos-all
- 0.6.0
+ 0.6.1-SNAPSHOT
../pom.xml
diff --git a/pom.xml b/pom.xml
index 7f7603ba8..140c07fbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
2018
com.alibaba.nacos
nacos-all
- 0.6.0
+ 0.6.1-SNAPSHOT
pom
Alibaba NACOS ${project.version}
@@ -36,7 +36,7 @@
git@github.com:alibaba/nacos.git
scm:git@github.com:alibaba/nacos.git
scm:git@github.com:alibaba/nacos.git
- nacos-all-0.5.0
+ nacos-all-0.6.1
@@ -726,5 +726,16 @@
+
+
+
+ releases
+ http://mvnrepo.alibaba-inc.com/mvn/releases
+
+
+ snapshots
+ http://mvnrepo.alibaba-inc.com/mvn/snapshots
+
+
diff --git a/test/pom.xml b/test/pom.xml
index 6913199b4..23acf981d 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -17,7 +17,7 @@
com.alibaba.nacos
nacos-all
- 0.6.0
+ 0.6.1-SNAPSHOT
../pom.xml
4.0.0