From a12364ddf007d3903fbc8183abcd9dca270194a5 Mon Sep 17 00:00:00 2001
From: Matt Rickard <mrick@google.com>
Date: Tue, 10 Jan 2017 10:42:06 -0800
Subject: [PATCH] Cut 0.15.0 release

---
 CHANGELOG.md | 11 +++++++++++
 Makefile     |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48387440b..2dc2329a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Minikube Release Notes
 
+## Version 0.15.0 - 1/10/2017
+* Update Dashboard to v1.5.1, fixes a CSRF vulnerability in the dashboard
+* Updated Kube-DNS addon to v1.9
+* Now supports kubenet as a network plugin
+* Added --feature-gates flag to enable alpha and experimental features in kube components 
+* Added --keep-context flag to keep the current kubectl context when starting minikube
+* Added environment variable to enable trace profiling in minikube binary
+* Updated default ISO to buildroot based minikube.iso v1.0.2
+* Localkube now runs as a systemd unit in the minikube VM
+* Switched integration tests to use golang subtest framework
+
 ## Version 0.14.0 - 12/14/2016
 * Update to k8s v1.5.1
 * Update Addon-manager to v6.1
diff --git a/Makefile b/Makefile
index ceb24ad32..a6e8cc5a2 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 
 # Bump these on release
 VERSION_MAJOR ?= 0
-VERSION_MINOR ?= 14
+VERSION_MINOR ?= 15
 VERSION_BUILD ?= 0
 VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 DEB_VERSION ?= $(VERSION_MAJOR).$(VERSION_MINOR)-$(VERSION_BUILD)
-- 
GitLab