From ac384f44298adf65cfb701ed2edfe1bd1be70b1a Mon Sep 17 00:00:00 2001
From: Matt Rickard <mrick@google.com>
Date: Wed, 14 Dec 2016 11:38:12 -0800
Subject: [PATCH] Cut v0.14.0 release

---
 CHANGELOG.md | 10 ++++++++++
 Makefile     |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e12110f9..48387440b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Minikube Release Notes
 
+## Version 0.14.0 - 12/14/2016
+* Update to k8s v1.5.1
+* Update Addon-manager to v6.1
+* Update Dashboard to v1.5
+* Run localkube as systemd unit in minikube-iso
+* Add ingress addon
+* Add aws-creds addon
+* Iso-url is now configurable through `minikube config set`
+* Refactor integration tests
+
 ## Version 0.13.1 - 12/5/2016
 * Fix `service list` command
 * Dashboard dowgnraded to v1.4.2, correctly shows PetSets again
diff --git a/Makefile b/Makefile
index 310f1ee1d..ade19c88d 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@
 
 # Bump these on release
 VERSION_MAJOR ?= 0
-VERSION_MINOR ?= 13
-VERSION_BUILD ?= 1
+VERSION_MINOR ?= 14
+VERSION_BUILD ?= 0
 VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 DEB_VERSION ?= $(VERSION_MAJOR).$(VERSION_MINOR)-$(VERSION_BUILD)
 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
-- 
GitLab