From cbc50a2a4410cfaae33c26d2304173bf0c0b1af7 Mon Sep 17 00:00:00 2001
From: Aaron Prindle <aprindle@google.com>
Date: Wed, 13 Jul 2016 11:25:07 -0700
Subject: [PATCH] Cutting v0.6.0 release.  Bumped version in Makefile and
 releases.json.  Added v0.6.0 to CHANGELOG.md

---
 CHANGELOG.md                  | 7 +++++++
 Makefile                      | 2 +-
 deploy/minikube/releases.json | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1286ffa3ed..16cba40a84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Minikube Release Notes
 
+## Version 0.6.0 - 7/13/2016
+* Added a `--disk-size` flag to `minikube start`.
+* Fixed a bug regarding auth tokens not being reconfigured properly after VM restart
+* Added a new `get-k8s-versions` command, to get the available kubernetes versions so that users know what versions are available when trying to selct the kubernetes version to use
+* Makefile Updates
+* Documentation Updates
+
 ## Version 0.5.0 - 7/6/2016
 * Updated Kubernetes components to v1.3.0
 * Added experimental support for KVM and XHyve based drivers. See the [drivers documentation](DRIVERS.md) for usage.
diff --git a/Makefile b/Makefile
index b2c2f67632..0ee7338897 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 export GO15VENDOREXPERIMENT=1
 
 # Bump this on release
-VERSION ?= v0.5.0
+VERSION ?= v0.6.0
 
 GOOS ?= $(shell go env GOOS)
 GOARCH ?= $(shell go env GOARCH)
diff --git a/deploy/minikube/releases.json b/deploy/minikube/releases.json
index c8e58b2afa..c833d059d7 100644
--- a/deploy/minikube/releases.json
+++ b/deploy/minikube/releases.json
@@ -1,4 +1,7 @@
 [
+  {
+    "name": "v0.6.0"
+  },
   {
     "name": "v0.5.0"
   },