chore(release): update version to v1.13.4

mboersma · mboersma · commit 3a19353299f5 · 2017-01-19T10:31:50.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,26 @@
+### v1.13.3 -> v1.13.4
+
+#### Fixes
+
+ - [`c63ade6`](https://github.com/deis/deis/commit/c63ade6027870308f046f17ce3aab268d2fdc61e) Godeps,deisctl: serialize a unit test and fix a package import
+ - [`7fd534c`](https://github.com/deis/deis/commit/7fd534c0b16389960290eb149c97c869331140ad) models: prune old containers before deploy
+ - [`49b008c`](https://github.com/deis/deis/commit/49b008ccaaeca4a778dbf8010ec3cde41f9b2913) contrib/azure: update template to current API and images
+ - [`d5d51cd`](https://github.com/deis/deis/commit/d5d51cdbb5caec564877f514ed86b9547b856c6a) client: do not add top level command to cmdArgs
+ - [`4ade016`](https://github.com/deis/deis/commit/4ade01607b1cbe9c583e6491fd4cd3b8b9599a65) perms: user-only settings file permissions
+ - [`2381530`](https://github.com/deis/deis/commit/2381530543d3fec4cb472bae24a646a8c76cce0d) database/build.sh: refer to stable pv package location
+
+#### Documentation
+
+ - [`68fb9b4`](https://github.com/deis/deis/commit/68fb9b4ca0d73339324766f44343441017ce1309) layout: Update notice with URL for published v2 docs
+
+#### Maintenance
+
+ - [`9b83d00`](https://github.com/deis/deis/commit/9b83d00d5910bb6e98a9a7aec6a0667b8e195cb8) buildpacks: update several buildpacks
+ - [`b5a1c38`](https://github.com/deis/deis/commit/b5a1c3844eeff06f0d0a5ae0420aef17b81c0f31) community: add latest community meeting
+ - [`e5f349d`](https://github.com/deis/deis/commit/e5f349dd9fb090aa993ad74758b3bbf038d44d23) community: september 2016 community meeting
+ - [`3ce03a4`](https://github.com/deis/deis/commit/3ce03a4f6ccc07719ffe98b5522de2b8e422e1c8) router: upgrade nginx to 1.10.1 stable
+ - [`014ba61`](https://github.com/deis/deis/commit/014ba61294ffd9e3430e5f745cc1835e4c1524b4) buildpacks: update heroku-buildpack-go to v46
+
 ### v1.13.2 -> v1.13.3
 
 #### Features
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 Deis (pronounced DAY-iss) is an open source PaaS that makes it easy to deploy and manage applications on your own servers. Deis builds upon [Docker](http://docker.io/) and [CoreOS](http://coreos.com) to provide a lightweight PaaS with a [Heroku-inspired](http://heroku.com) workflow.
 
 [![Build Status](https://ci.deis.io/buildStatus/icon?job=test-acceptance)](https://ci.deis.io/job/test-acceptance/)
-[![Current Release](http://img.shields.io/badge/release-v1.13.3-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.13.3)
+[![Current Release](http://img.shields.io/badge/release-v1.13.4-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.13.4)
 [![Latest Docs](http://img.shields.io/badge/docs-latest-fc1e5e.svg)](http://docs.deis.io/en/latest/)
 
 New to Deis?  Learn more about Deis [Concepts](http://docs.deis.io/en/latest/understanding_deis/concepts/), [Architecture](http://docs.deis.io/en/latest/understanding_deis/architecture/) and how to [Deploy an Application](http://docs.deis.io/en/latest/using_deis/deploy-application/).
diff --git a/client/deis-version b/client/deis-version
@@ -1 +1 @@
-1.14.0-dev
+1.13.4
diff --git a/contrib/coreos/user-data.example b/contrib/coreos/user-data.example
@@ -111,7 +111,7 @@ coreos:
 
         [Service]
         Type=oneshot
-        ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.13.3'
+        ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.13.4'
     - name: increase-nf_conntrack-connections.service
       command: start
       content: |
@@ -125,7 +125,7 @@ coreos:
 write_files:
   - path: /etc/deis-release
     content: |
-      DEIS_RELEASE=v1.13.3
+      DEIS_RELEASE=v1.13.4
   - path: /etc/motd
     content: " \e[31m* *    \e[34m*   \e[32m*****    \e[39mddddd   eeeeeee iiiiiii   ssss\n\e[31m*   *  \e[34m* *  \e[32m*   *     \e[39md   d   e    e    i     s    s\n \e[31m* *  \e[34m***** \e[32m*****     \e[39md    d  e         i    s\n\e[32m*****  \e[31m* *    \e[34m*       \e[39md     d e         i     s\n\e[32m*   * \e[31m*   *  \e[34m* *      \e[39md     d eee       i      sss\n\e[32m*****  \e[31m* *  \e[34m*****     \e[39md     d e         i         s\n  \e[34m*   \e[32m*****  \e[31m* *      \e[39md    d  e         i          s\n \e[34m* *  \e[32m*   * \e[31m*   *     \e[39md   d   e    e    i    s    s\n\e[34m***** \e[32m*****  \e[31m* *     \e[39mddddd   eeeeeee iiiiiii  ssss\n\n\e[39mWelcome to Deis\t\t\tPowered by Core\e[38;5;45mO\e[38;5;206mS\e[39m\n"
   - path: /etc/profile.d/nse-function.sh
diff --git a/contrib/utils.sh b/contrib/utils.sh
@@ -14,4 +14,4 @@ function echo_green {
 
 export COREOS_CHANNEL=${COREOS_CHANNEL:-stable}
 export COREOS_VERSION=${COREOS_VERSION:-1068.8.0}
-export DEIS_RELEASE=1.13.3
+export DEIS_RELEASE=1.13.4
diff --git a/controller/deis/__init__.py b/controller/deis/__init__.py
@@ -6,4 +6,4 @@
 
 from __future__ import absolute_import
 
-__version__ = '1.14.0-dev'
+__version__ = '1.13.4'
diff --git a/deisctl/client/client.go b/deisctl/client/client.go
@@ -273,7 +273,7 @@ Usage:
 Options:
   -p --path=<target>   where to save unit files [default: $HOME/.deis/units]
   -t --tag=<tag>       git tag, branch, or SHA to use when downloading unit files
-                       [default: master]
+                       [default: v1.13.4]
 `
 	// parse command-line arguments
 	args, err := docopt.Parse(usage, argv, true, "", false)
diff --git a/deisctl/deis-version b/deisctl/deis-version
@@ -1 +1 @@
-1.14.0-dev
+1.13.4
diff --git a/docs/_includes/_get-the-source.rst b/docs/_includes/_get-the-source.rst
@@ -6,7 +6,7 @@ this documentation. Download an archive file from the `releases page`_, or use
 
     $ git clone https://github.com/deis/deis.git
     $ cd deis
-    $ git checkout v1.13.3
+    $ git checkout v1.13.4
 
 Check out the latest Deis release, rather than using the default (master).
 
diff --git a/docs/installing_deis/install-deisctl.rst b/docs/installing_deis/install-deisctl.rst
@@ -18,11 +18,11 @@ and run the latest installer:
 .. code-block:: console
 
     $ cd ~/bin
-    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.13.3
+    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.13.4
     $ # on CoreOS, add "sudo" to install to /opt/bin/deisctl
-    $ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.13.3
+    $ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.13.4
 
-This installs ``deisctl`` version 1.13.3 to the current directory, and downloads the matching
+This installs ``deisctl`` version 1.13.4 to the current directory, and downloads the matching
 Deis systemd unit files used to schedule the components. Link ``deisctl`` into /usr/local/bin, so
 it will be in your ``$PATH``:
 
@@ -33,10 +33,10 @@ it will be in your ``$PATH``:
 To change installation options, save the installer directly:
 
 .. image:: download-linux-brightgreen.svg
-   :target: https://s3-us-west-2.amazonaws.com/get-deis/deisctl-1.13.3-linux-amd64.run
+   :target: https://s3-us-west-2.amazonaws.com/get-deis/deisctl-1.13.4-linux-amd64.run
 
 .. image:: download-osx-brightgreen.svg
-   :target: https://s3-us-west-2.amazonaws.com/get-deis/deisctl-1.13.3-darwin-amd64.run
+   :target: https://s3-us-west-2.amazonaws.com/get-deis/deisctl-1.13.4-darwin-amd64.run
 
 Then run the downloaded file as a shell script. Append ``--help`` to see what options
 are available.
diff --git a/docs/installing_deis/install-platform.rst b/docs/installing_deis/install-platform.rst
@@ -14,7 +14,7 @@ First check that you have ``deisctl`` installed and the version is correct.
 .. code-block:: console
 
     $ deisctl --version
-    1.13.3
+    1.13.4
 
 If not, follow instructions to :ref:`install_deisctl`.
 
diff --git a/docs/managing_deis/upgrading-deis.rst b/docs/managing_deis/upgrading-deis.rst
@@ -41,10 +41,10 @@ Finally, update ``deisctl`` to the new version and reinstall:
 
 .. code-block:: console
 
-    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.13.3
+    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.13.4
     $ deisctl --version  # should match the desired platform
-    1.13.3
-    $ deisctl config platform set version=v1.13.3
+    1.13.4
+    $ deisctl config platform set version=v1.13.4
     $ deisctl install platform
     $ deisctl start platform
 
@@ -105,11 +105,11 @@ to. Care should be taken not to overwrite the existing ``deisctl`` version.
 .. code-block:: console
 
     $ mkdir /tmp/upgrade
-    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.13.3 /tmp/upgrade
+    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.13.4 /tmp/upgrade
     $ /tmp/upgrade/deisctl --version  # should match the desired platform
-    1.13.3
+    1.13.4
     $ /tmp/upgrade/deisctl refresh-units
-    $ /tmp/upgrade/deisctl config platform set version=v1.13.3
+    $ /tmp/upgrade/deisctl config platform set version=v1.13.4
 
 Now it is possible to prepare the cluster for the upgrade using the old ``deisctl`` binary. This command will shutdown
 and uninstall all components of the cluster except the router and publisher. This means your services should still be
@@ -134,7 +134,7 @@ If the process were to fail, the old version can be restored manually by reinsta
 
     $ /tmp/upgrade/deisctl stop platform
     $ /tmp/upgrade/deisctl uninstall platform
-    $ /tmp/upgrade/deisctl config platform set version=v1.13.3
+    $ /tmp/upgrade/deisctl config platform set version=v1.13.4
     $ /opt/bin/deisctl refresh-units
     $ /opt/bin/deisctl install platform
     $ /opt/bin/deisctl start platform
diff --git a/docs/reference/api-v1.7.rst b/docs/reference/api-v1.7.rst
diff --git a/docs/troubleshooting_deis/index.rst b/docs/troubleshooting_deis/index.rst
diff --git a/version/version.go b/version/version.go

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@`
`6`	`6`
`7`	`7`	`from __future__ import absolute_import`
`8`	`8`
`9`		`-__version__ = '1.14.0-dev'`
	`9`	`+__version__ = '1.13.4'`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ Usage:`
`273`	`273`	`Options:`
`274`	`274`	`-p --path=<target> where to save unit files [default: $HOME/.deis/units]`
`275`	`275`	`-t --tag=<tag> git tag, branch, or SHA to use when downloading unit files`
`276`		`- [default: master]`
	`276`	`+ [default: v1.13.4]`
`277`	`277`	`
`278`	`278`	`// parse command-line arguments`
`279`	`279`	`args, err := docopt.Parse(usage, argv, true, "", false)`