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

Bump version to 1.2.5
docker-archive · Aug 18, 2016 · 27968ed · 27968ed
2 parents dcaaa55 + 04114bb
commit 27968ed
Show file tree

Hide file tree

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