Merged 0.5.2 hotfix release back to master

2013-08-08 19:45:57 -07:00 · 2013-08-08 19:45:57 -07:00 · b8f8f9d07e
commit b8f8f9d07e
parent 28d38620f0 1643943402
2 changed files with 6 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,10 @@
 # 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)
 + API: Docker client now sets useragent (RFC 2616)
 + Runtime: Add `ps` args to `docker top`
--- a/commands.go
+++ b/commands.go
@ -27,7 +27,7 @@ import (
 	"unicode"
 )

-const VERSION = "0.5.1-dev"
+const VERSION = "0.5.2-dev"

 var (
 	GITCOMMIT string