From 777964583fc4fc97d7acd7f10f1b45cefc4f6318 Mon Sep 17 00:00:00 2001
From: Nishant Totla <nishanttotla@gmail.com>
Date: Thu, 5 May 2016 16:53:47 -0700
Subject: [PATCH] Bump version to 1.2.2-rc1

Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
---
 CHANGELOG.md       | 6 ++++++
 version/version.go | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a07bcf0d5e..6ce82548d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.2.2 (2016-05-05)
+
+#### Cluster management
+
+- Fix deadlock that causes Swarm to hang
+
 ## 1.2.1 (2016-05-03)
 
 #### Scheduler
diff --git a/version/version.go b/version/version.go
index dfb48b276f..4e3c8b763c 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.1"
+	VERSION = "1.2.2"
 
 	// GITCOMMIT will be overwritten automatically by the build system
 	GITCOMMIT = "HEAD"