From 04114bb5b537b517848a3edd04c2661a18b1d6d3 Mon Sep 17 00:00:00 2001
From: Dong Chen <dongluo.chen@docker.com>
Date: Thu, 18 Aug 2016 15:39:35 -0700
Subject: [PATCH] Bump version to 1.2.5

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1405e7fdf2..b167a1d96f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## 1.2.5 (2016-08-18)
+
+#### Scheduler
+
+- Fix container rescheduling with overlay network
+- Fix scheduler detail log improper effect when container name is empty
+- Check unique container name on create and rename for Mesos cluster
+
+#### Health check
+
+- Refresh container status on health_status events
+
+#### Doc
+
+- Fix install-w-machine.md using docker-machine --swarm feature
+
 ## 1.2.4 (2016-07-28)
 
 #### API
diff --git a/version/version.go b/version/version.go
index 785c1a027a..a24e1eb003 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.4"
+	VERSION = "1.2.5"
 
 	// GITCOMMIT will be overwritten automatically by the build system
 	GITCOMMIT = "HEAD"