Merge pull request #2158 from dongluochen/bump-1.2.1rc1

bump 1.2.1-rc1
docker-archive · Apr 23, 2016 · 584e10c · 584e10c
2 parents bf9e985 + 7cca0cb
commit 584e10c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Changelog
 
+## 1.2.1 (2016-04-22)
+
+#### API
+
+Use engine-api to handle large number of API calls
+Update ContainerConfig to embed HostConfig and NetworkingConfig
+stop/restart/kill an non-existent container should returns 500 rather than 404
+Return an error when assertion fails in hijack
+Return error when Image Pull fails
+Fix image pull bug (wait until download finishes)
+
+#### Build
+
+Switch to go 1.6.2
+Move dependencies to vendor/
+Updating Image Pull to use docker/distribution package
+
+#### Misc
+
+Documentation clean up
+
 ## 1.2.0 (2016-04-13)
 
 #### Scheduler

diff --git a/version/version.go b/version/version.go
@@ -2,7 +2,7 @@ package version
 
 var (
 	// VERSION should be updated by hand at each release
-	VERSION = "1.2.0"
+	VERSION = "1.2.1"
 
 	// GITCOMMIT will be overwritten automatically by the build system
 	GITCOMMIT = "HEAD"