Merge pull request #2574 from dongluochen/bump-1.2.6-rc1

Bump version to 1.2.6-rc1
docker-archive · Dec 21, 2016 · ec84706 · ec84706
2 parents 87c150b + cfe4df5
commit ec84706
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Changelog
 
+## 1.2.6-rc1 (2016-12-19)
+
+#### API
+
+- Switch from engine-api to docker/api/type and docker/clients
+- Pass size parameter through on container inspect
+
+#### Scheduler
+
+- Precompile filter regular expression to reduce PU usage
+- Remove setTCPUserTimeout to avoid TCP connection leak
+- Fix network endpoints for rescheduling
+- Give up leadership when manager shuts down
+
+#### MISC
+
+- Migrate documentation to https://github.com/docker/docker.github.io/tree/master/swarm
+- Update Swarm CI to use go 1.7.1
+- support GOARCH to be able to build for other architectures
+- Send Swarm logs to stdout
+
 ## 1.2.5 (2016-08-18)
 
 #### Scheduler

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