Merge pull request #2350 from nishanttotla/bump-v1.2.4-rc1

Bump version to 1.2.4-rc1
docker-archive · Jun 14, 2016 · d8e7932 · d8e7932
2 parents a84967a + fa4325a
commit d8e7932
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,22 @@
 # Changelog
 
+## 1.2.4 (2016-06-14)
+
+#### API
+
+- Code refactoring
+
+#### Test
+
+- Fix leader election tests
+
 ## 1.2.3 (2016-05-25)
 
 #### API
 
 - Update `engine-api` vendoring (supports new functions and signatures)
 - Fix registry auth bug for image pulls
 
-
 ## 1.2.2 (2016-05-05)
 
 #### Cluster management

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.3"
+	VERSION = "1.2.4"
 
 	// GITCOMMIT will be overwritten automatically by the build system
 	GITCOMMIT = "HEAD"