chore(release): update version in master to v1.5.1

mboersma · mboersma · commit f97a8d84a206 · 2015-04-11T18:36:47.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -58,6 +58,8 @@ htmlcov/
 
 # integration test droppings
 tests/example-*
+tests/*.cert
+tests/*.key
 
 # extra .py droppings from building docs
 /__init__.py
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+### v1.5.0 -> v1.5.1
+
+#### Fixes
+
+ - [`0866951`](https://github.com/deis/deis/commit/0866951334e3affaa9d04ae8f89f95bfe2590682) builder: exit 1 when gitreceive captures a build
+ - [`64c0990`](https://github.com/deis/deis/commit/64c0990e8cf1d71a45e2361f9d389abdfc53f0f0) router: use nginx $host in HTTPS redirects
+
+#### Maintenance
+
+ - [`f66ae3b`](https://github.com/deis/deis/commit/f66ae3badfd9f330a7b0caa7fd82aaef9521b9e8) release: update version to v1.5.1
+
 ### v1.4.1 -> v1.5.0
 
 #### Features
diff --git a/README.md b/README.md
@@ -3,7 +3,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.5.0-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.5.0)
+[![Current Release](http://img.shields.io/badge/release-v1.5.1-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.5.1)
 [![Latest Docs](http://img.shields.io/badge/docs-latest-fc1e5e.svg)](http://docs.deis.io/en/latest/)
 
 ![Deis Graphic](https://s3-us-west-2.amazonaws.com/deis-images/deis-graphic.png)
diff --git a/contrib/coreos/user-data.example b/contrib/coreos/user-data.example
@@ -63,7 +63,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.5.0'
+      ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.5.1'
   - name: ntpdate.service
     command: start
   - name: timedate-ntp-synchronization.service
@@ -112,7 +112,7 @@ coreos:
 write_files:
   - path: /etc/deis-release
     content: |
-      DEIS_RELEASE=v1.5.0
+      DEIS_RELEASE=v1.5.1
   - 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/docs/contributing/releases.rst b/docs/contributing/releases.rst
@@ -31,9 +31,10 @@ Patch Release
     $ ./contrib/bumpver/bumpver -f A.B.C A.B.D \
         README.md \
         builder/image/Dockerfile \
-        builder/slugbuilder/Dockerfile \
-        builder/slugrunner/Dockerfile \
+        builder/image/slugbuilder/Dockerfile \
+        builder/image/slugrunner/Dockerfile \
         cache/Dockerfile \
+        cache/image/Dockerfile \
         client/deis.py \
         client/setup.py \
         contrib/coreos/user-data.example \
@@ -45,7 +46,7 @@ Patch Release
         docs/installing_deis/install-deisctl.rst \
         docs/installing_deis/install-platform.rst \
         docs/managing_deis/upgrading-deis.rst \
-        docs/reference/api-v1.1.rst \
+        docs/reference/api-v1.2.rst \
         docs/troubleshooting_deis/index.rst \
         logger/image/Dockerfile \
         logspout/image/Dockerfile \
@@ -95,7 +96,7 @@ Major or Minor Release
         docs/installing_deis/install-deisctl.rst \
         docs/installing_deis/install-platform.rst \
         docs/managing_deis/upgrading-deis.rst \
-        docs/reference/api-v1.1.rst \
+        docs/reference/api-v1.2.rst \
         docs/troubleshooting_deis/index.rst
 
   - Edit deisctl/cmd/cmd.go and change the default in the RefreshUnits usage string
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.5.0
+    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.5.1
     $ # on CoreOS, add "sudo" to install to /opt/bin/deisctl
-    $ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.5.0
+    $ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.5.1
 
-This installs ``deisctl`` version 1.5.0 to the current directory, and downloads the matching
+This installs ``deisctl`` version 1.5.1 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/opdemand/deisctl-1.5.0-linux-amd64.run
+   :target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.5.1-linux-amd64.run
 
 .. image:: download-osx-brightgreen.svg
-   :target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.5.0-darwin-amd64.run
+   :target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.5.1-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.5.0
+    1.5.1
 
 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.5.0
+    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.5.1
     $ deisctl --version  # should match the desired platform
-    1.5.0
-    $ deisctl config platform set version=v1.5.0
+    1.5.1
+    $ deisctl config platform set version=v1.5.1
     $ deisctl install platform
     $ deisctl start platform
 
diff --git a/docs/troubleshooting_deis/index.rst b/docs/troubleshooting_deis/index.rst
@@ -85,7 +85,7 @@ If you built ``deisctl`` locally or didn't use its installer, you may see an err
 
 This is because ``deisctl`` could not find unit files for Deis locally. Run
 ``deisctl help refresh-units`` to see where ``deisctl`` searches, and then run a command such as
-``deisctl refresh-units --tag=v1.5.0``, or set the ``$DEISCTL_UNITS`` environment variable to a directory
+``deisctl refresh-units --tag=v1.5.1``, or set the ``$DEISCTL_UNITS`` environment variable to a directory
 containing the unit files.
 
 Other issues
