From 7ba480c9ee81a5dc14bd80c67e10b8a8e3448272 Mon Sep 17 00:00:00 2001
From: "Tim St. Clair" <stclair@google.com>
Date: Tue, 2 Aug 2016 10:54:37 -0700
Subject: [PATCH] Cherrypick release v0.23.8

---
 CHANGELOG.md    | 20 ++++++++++++++++++++
 version/VERSION |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69cef20d5b..ccb8e6a233 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Changelog
 
+### 0.23.8 (2016-08-02)
+
+- Cherry-pick release:
+  - Prefix Docker labels & env vars in Prometheus metrics to prevent conflicts
+
+### 0.23.7 (2016-07-18)
+
+- Cherry-pick release:
+  - Modify working set memory stats calculation
+
+### 0.23.6 (2016-06-23)
+
+- Cherry-pick release:
+  - Updating inotify to fix memory leak v0.23 cherrypick
+
+### 0.23.5 (2016-06-22)
+
+- Cherry-pick release:
+  - support LVM based device mapper storage drivers
+
 ### 0.23.4 (2016-06-16)
 - Cherry-pick release:
   - Check for thin_is binary in path for devicemapper when using ThinPoolWatcher
diff --git a/version/VERSION b/version/VERSION
index 40a6dfede5..6b0b477a82 100644
--- a/version/VERSION
+++ b/version/VERSION
@@ -1 +1 @@
-0.23.4
+0.23.8