浏览代码

Merged 0.5.2 hotfix release back to master

Solomon Hykes 12 年之前
父节点
当前提交
b8f8f9d07e
共有 2 个文件被更改,包括 6 次插入1 次删除
  1. 5 0
      CHANGELOG.md
  2. 1 1
      commands.go

+ 5 - 0
CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 # Changelog
 
 
+## 0.5.2 (2013-08-08)
+ * Builder: Forbid certain paths within docker build ADD
+ - Runtime: Change network range to avoid conflict with EC2 DNS
+ * API: Change daemon to listen on unix socket by default
+
 ## 0.5.1 (2013-07-30)
 ## 0.5.1 (2013-07-30)
  + API: Docker client now sets useragent (RFC 2616)
  + API: Docker client now sets useragent (RFC 2616)
  + Runtime: Add `ps` args to `docker top`
  + Runtime: Add `ps` args to `docker top`

+ 1 - 1
commands.go

@@ -27,7 +27,7 @@ import (
 	"unicode"
 	"unicode"
 )
 )
 
 
-const VERSION = "0.5.1-dev"
+const VERSION = "0.5.2-dev"
 
 
 var (
 var (
 	GITCOMMIT string
 	GITCOMMIT string