docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2211 from nishanttotla/bump-1.2.2-rc1 

Bump version to 1.2.2-rc1
This commit is contained in:
Nishant Totla 2016-05-05 17:49:03 -07:00
parent 502c00b150 777964583f
commit 372ad21097
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,5 +1,11 @@
# Changelog # Changelog
## 1.2.2 (2016-05-05)
#### Cluster management
- Fix deadlock that causes Swarm to hang
## 1.2.1 (2016-05-03) ## 1.2.1 (2016-05-03)
#### Scheduler #### Scheduler

2
version/version.go
View File

@ -2,7 +2,7 @@ package version
var ( var (
// VERSION should be updated by hand at each release // VERSION should be updated by hand at each release
VERSION = "1.2.1" VERSION = "1.2.2"
// GITCOMMIT will be overwritten automatically by the build system // GITCOMMIT will be overwritten automatically by the build system
GITCOMMIT = "HEAD" GITCOMMIT = "HEAD"