Merge pull request #1080 from jimmidyson/release-0.20.5

0.20.5 version bump
google · Jan 27, 2016 · 9aa348f · 9aa348f
2 parents 4c345b1 + 4f7f2ff
commit 9aa348f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### 0.20.5 (2016-01-27)
+- Breaking: Use uint64 for memory stats
+- Bug: Fix devicemapper partition labelling
+- Bug: Fix network stats when using new Docker network functionality
+- Bug: Fix env var label mapping initialization
+- Dependencies: libcontainer update
+
 ### 0.20.4 (2016-01-20)
 - Godep updates
 

diff --git a/version/VERSION b/version/VERSION
@@ -1 +1 @@
-0.20.4
+0.20.5