Merge pull request #91 from qiniu/develop

QCOS-3940 Merge develop into master for Release v3.0.1
qiniu · Mar 10, 2017 · 4a67270 · 4a67270
2 parents ba9fb4c + 4b4c590
commit 4a67270
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # vNext
 
+# Release 3.0.1
+- 新增 CongigService 渲染容器配置模板失败时，容器错误信息
+
 # Release 3.0.0
 - AP详情添加enabled字段，表示这个AP是否已被管理员禁用
 - 修复GetContainerLogsRealtime连接错误导致panic的bug

diff --git a/kirksdk/kirksdk.go b/kirksdk/kirksdk.go
@@ -1,3 +1,3 @@
 package kirksdk
 
-const Version = "3.0.0"
+const Version = "3.0.1"
diff --git a/kirksdk/qcos_error.go b/kirksdk/qcos_error.go
@@ -0,0 +1,5 @@
+package kirksdk
+
+const (
+	RenderTemplateFail = "render template fail"
+)