From fa4325ad6fc408d2f03d25ff174b9cc67b3164d2 Mon Sep 17 00:00:00 2001
From: Nishant Totla <nishanttotla@gmail.com>
Date: Tue, 14 Jun 2016 16:49:45 -0700
Subject: [PATCH] Bump version to 1.2.4-rc1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96528bb499..a81df4429b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 1.2.4 (2016-06-14)
+
+#### API
+
+- Code refactoring
+
+#### Test
+
+- Fix leader election tests
+
 ## 1.2.3 (2016-05-25)
 
 #### API
@@ -7,7 +17,6 @@
 - 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
index 3f4cf69df1..785c1a027a 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.3"
+	VERSION = "1.2.4"
 
 	// GITCOMMIT will be overwritten automatically by the build system
 	GITCOMMIT = "HEAD"