From 7908d73652c50e9b11e44cbbd6104f6aa0ffa3c3 Mon Sep 17 00:00:00 2001
From: Charlie Drage <charlie@charliedrage.com>
Date: Mon, 18 Sep 2017 14:38:34 -0400
Subject: [PATCH] 1.2.0 Release

---
 CHANGELOG.md         | 11 +++++++++++
 README.md            |  6 +++---
 build/VERSION        |  2 +-
 cmd/version.go       |  2 +-
 docs/installation.md |  6 +++---
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96ee1cee..d3408510 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Change Log
 
+## [v1.2.0](https://github.com/kubernetes/kompose/tree/v1.2.0) (2017-09-18)
+[Full Changelog](https://github.com/kubernetes/kompose/compare/v1.1.0...v1.2.0)
+
+**Merged pull requests:**
+
+- Update the styles.css for larger width [\#812](https://github.com/kubernetes/kompose/pull/812) ([cdrage](https://github.com/cdrage))
+- emptvols -\> volumes=yes [\#811](https://github.com/kubernetes/kompose/pull/811) ([ashetty1](https://github.com/ashetty1))
+- Remove redundant strings.ToLower\(\) [\#808](https://github.com/kubernetes/kompose/pull/808) ([cdrage](https://github.com/cdrage))
+- Add --volumes parameter, deprecate emptyvols [\#787](https://github.com/kubernetes/kompose/pull/787) ([cdrage](https://github.com/cdrage))
+
 ## [v1.1.0](https://github.com/kubernetes/kompose/tree/v1.1.0) (2017-08-30)
 [Full Changelog](https://github.com/kubernetes/kompose/compare/v1.0.0...v1.1.0)
 
@@ -30,6 +40,7 @@
 
 **Merged pull requests:**
 
+- 1.1.0 Release [\#804](https://github.com/kubernetes/kompose/pull/804) ([cdrage](https://github.com/cdrage))
 - Adding OpenShift tests for deploy keys [\#802](https://github.com/kubernetes/kompose/pull/802) ([ashetty1](https://github.com/ashetty1))
 - Fixes output of help template [\#800](https://github.com/kubernetes/kompose/pull/800) ([cdrage](https://github.com/cdrage))
 - Fix kompose docker container wrong href [\#797](https://github.com/kubernetes/kompose/pull/797) ([JadCham](https://github.com/JadCham))
diff --git a/README.md b/README.md
index 2d27fc36..754c6439 100644
--- a/README.md
+++ b/README.md
@@ -44,10 +44,10 @@ __Linux and macOS:__
 
 ```sh
 # Linux
-curl -L https://github.com/kubernetes/kompose/releases/download/v1.1.0/kompose-linux-amd64 -o kompose
+curl -L https://github.com/kubernetes/kompose/releases/download/v1.2.0/kompose-linux-amd64 -o kompose
 
 # macOS
-curl -L https://github.com/kubernetes/kompose/releases/download/v1.1.0/kompose-darwin-amd64 -o kompose
+curl -L https://github.com/kubernetes/kompose/releases/download/v1.2.0/kompose-darwin-amd64 -o kompose
 
 chmod +x kompose
 sudo mv ./kompose /usr/local/bin/kompose
@@ -55,7 +55,7 @@ sudo mv ./kompose /usr/local/bin/kompose
 
 __Windows:__
 
-Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.1.0/kompose-windows-amd64.exe) and add the binary to your PATH.
+Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.2.0/kompose-windows-amd64.exe) and add the binary to your PATH.
 
 ## Shell autocompletion
 
diff --git a/build/VERSION b/build/VERSION
index 9084fa2f..26aaba0e 100644
--- a/build/VERSION
+++ b/build/VERSION
@@ -1 +1 @@
-1.1.0
+1.2.0
diff --git a/cmd/version.go b/cmd/version.go
index 438dcb35..8621f4d0 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -24,7 +24,7 @@ import (
 
 var (
 	// VERSION  is version number that wil be displayed when running ./kompose version
-	VERSION = "1.1.0"
+	VERSION = "1.2.0"
 	// GITCOMMIT is hash of the commit that wil be displayed when running ./kompose version
 	// this will be overwritten when running  build like this: go build -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=$(GITCOMMIT)"
 	// HEAD is default indicating that this was not set during build
diff --git a/docs/installation.md b/docs/installation.md
index 520155ad..a8ba18b5 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -10,10 +10,10 @@ __Linux and macOS:__
 
 ```sh
 # Linux
-curl -L https://github.com/kubernetes/kompose/releases/download/v1.1.0/kompose-linux-amd64 -o kompose
+curl -L https://github.com/kubernetes/kompose/releases/download/v1.2.0/kompose-linux-amd64 -o kompose
 
 # macOS
-curl -L https://github.com/kubernetes/kompose/releases/download/v1.1.0/kompose-darwin-amd64 -o kompose
+curl -L https://github.com/kubernetes/kompose/releases/download/v1.2.0/kompose-darwin-amd64 -o kompose
 
 chmod +x kompose
 sudo mv ./kompose /usr/local/bin/kompose
@@ -21,7 +21,7 @@ sudo mv ./kompose /usr/local/bin/kompose
 
 __Windows:__
 
-Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.1.0/kompose-windows-amd64.exe) and add the binary to your PATH.
+Download from [GitHub](https://github.com/kubernetes/kompose/releases/download/v1.2.0/kompose-windows-amd64.exe) and add the binary to your PATH.
 
 
 #### Nightly / master release