From 886b54793f6a31de667640517cc20fff88df85d3 Mon Sep 17 00:00:00 2001
From: Victor Marmol <vmarmol@google.com>
Date: Wed, 15 Apr 2015 15:54:17 -0700
Subject: [PATCH] cAdvisor 0.12.0

---
 CHANGELOG.md       | 8 +++++++-
 version/version.go | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1920984d..ccfc92ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 
-## 0.11.1 (2015-03-27)
+## 0.12.0 (2015-04-15)
+- Added support for Docker 1.6.
+- Split OOM event into OOM kill and OOM.
+- Made EventData a concrete type in returned events.
+- Enabled CPU load tracking (experimental).
+
+## 0.11.0 (2015-03-27)
 - Export all stats as [Prometheus](http://prometheus.io/) metrics.
 - Initial support for [events](docs/api.md): creation, deletion, and OOM.
 - Adding machine UUID information.
diff --git a/version/version.go b/version/version.go
index bed71eb1..6967e244 100644
--- a/version/version.go
+++ b/version/version.go
@@ -15,4 +15,4 @@
 package version
 
 // Version of cAdvisor.
-const VERSION = "0.11.0"
+const VERSION = "0.12.0"