From 7cca0cbcde929b95abae60d09fdef62d04dbfaa5 Mon Sep 17 00:00:00 2001
From: Dong Chen <dongluo.chen@docker.com>
Date: Fri, 22 Apr 2016 16:49:22 -0700
Subject: [PATCH] Bump 1.2.1-rc1

Signed-off-by: Dong Chen <dongluo.chen@docker.com>
---
 CHANGELOG.md       | 21 +++++++++++++++++++++
 version/version.go |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c544836472..5cb486bf1f 100644
--- 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
index a46befc09e..dfb48b276f 100644
--- 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"