From 6eeb7bf59689e5632ecabd14ed699f6816ed7c97 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Mon, 10 Oct 2016 10:42:40 -0400
Subject: [PATCH] Prepare for 1.4.1: bump nodeup; add docs

---
 HISTORY.md                           |  9 +++++++++
 README.md                            | 14 +++++++++-----
 docs/releases.md                     | 13 +++++++++++++
 upup/pkg/fi/cloudup/apply_cluster.go |  4 ++--
 4 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 HISTORY.md
 create mode 100644 docs/releases.md

diff --git a/HISTORY.md b/HISTORY.md
new file mode 100644
index 0000000000..205942de00
--- /dev/null
+++ b/HISTORY.md
@@ -0,0 +1,9 @@
+## 1.4.1
+
+* Fix dns-controller when multiple HostedZones with the same name
+* Initial support for CentOS / RHEL7
+* Initial k8s-style API & examples
+
+## 1.4.0
+
+* Initial stable release
\ No newline at end of file
diff --git a/README.md b/README.md
index 4cd6f99261..f104ace796 100644
--- a/README.md
+++ b/README.md
@@ -15,21 +15,25 @@ Some of the more interesting features:
 
 ## Recent changes
 
-Improvements are being made almost daily, but bigger changes are described here (until we get to
-a more formal release process):
-
-* Reworked SSH keys and support for running CI builds [Aug 11 2016](CHANGES.md#aug-11-2016)
-* Create command was split into create and update [Jul 21 2016](CHANGES.md#jul-21-2016)
+Change history is available in [HISTORY.md](HISTORY.md)
 
 ## Installation
 
+We recommend using a release from the Release tab above.
+
+## Installation from source
+
 Build the code (make sure you have set GOPATH):
 ```
 go get -d k8s.io/kops
+git checkout release
 cd ${GOPATH}/src/k8s.io/kops/
 make
 ```
 
+* The `release` branch is where releases are taken from.  This is the stable code branch.
+* The `master` branch  _should_ also be functional, but is where active development happens, so may be less stable.
+
 (Note that the code uses the relatively new Go vendoring, so building requires Go 1.6 or later,
 or you must export GO15VENDOREXPERIMENT=1 when building with Go 1.5.  The makefile sets
 GO15VENDOREXPERIMENT for you.  Go code generation does not honor the env var in 1.5, so for development
diff --git a/docs/releases.md b/docs/releases.md
new file mode 100644
index 0000000000..7c9e308ea3
--- /dev/null
+++ b/docs/releases.md
@@ -0,0 +1,13 @@
+## Branch strategy
+
+We develop on the master branch.  The master branch is expected to build and generally to work,
+but has not necessarily undergone the more complete validation that a release would.  The `release`
+branch is expected to always be stable.
+
+We tag releases as needed from the `release` branch and upload them to github.
+
+We occasionally batch merge from the master branch to the `release` branch.  We don't maintain
+multiple release branches as we expect most people to upgrade kops to the latest version.  We also
+don't (yet) do lots of cherry-picking for that reason.
+
+The intention is that this allows for development velocity, while also allowing for stable releases.
diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go
index 6023162e95..4d493c15ca 100644
--- a/upup/pkg/fi/cloudup/apply_cluster.go
+++ b/upup/pkg/fi/cloudup/apply_cluster.go
@@ -23,12 +23,12 @@ import (
 )
 
 const (
-	NodeUpVersion = "1.4.0"
+	NodeUpVersion = "1.4.1"
 )
 
 const MaxAttemptsWithNoProgress = 3
 
-var CloudupModels = []string{"config","proto","cloudup"}
+var CloudupModels = []string{"config", "proto", "cloudup"}
 
 type ApplyClusterCmd struct {
 	Cluster *api.Cluster