Merge pull request #2454 from dongluochen/bump-v1.2.5

dongluochen · web-flow · commit 27968edd8a16 · 2016-08-18T16:05:59.000-07:00
Bump version to 1.2.5
diff --git 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
@@ -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"
