Merge pull request #2211 from nishanttotla/bump-1.2.2-rc1

Bump version to 1.2.2-rc1
docker-archive · May 6, 2016 · 372ad21 · 372ad21
2 parents 502c00b + 7779645
commit 372ad21
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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"