Merge pull request #1325 from timstclair/release-v0.23

vishh · vishh · commit 6607e7cf50df · 2016-06-08T11:45:31.000-07:00
Release v0.23.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,11 @@
 # Changelog
 
+### 0.23.3 (2016-06-08)
+- Cherry-pick release:
+  - Cap the maximum consecutive du commands
+  - Fix a panic when a prometheus endpoint ends with a newline
+
 ### 0.23.2 (2016-05-18)
-- Final release for Kubernetes 1.3
 - Handle kernel log rotation
 - More rkt support: poll rkt service for new containers
 - Better handling of partial failures when fetching subcontainers
diff --git a/version/VERSION b/version/VERSION
@@ -1 +1 @@
-0.23.2
+0.23.3
