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

mboersma · mboersma · commit 4ab01b1189db · 2015-05-14T15:38:18.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+### v1.6.0 -> v1.6.1
+
+#### Fixes
+
+ - [`13bd5f2`](https://github.com/deis/deis/commit/13bd5f2c70054b7ea9c45d802b44622d578d21b3) client: pin cryptography library at 0.8.2
+ - [`5e09bff`](https://github.com/deis/deis/commit/5e09bff5f7fd061af0ca6a07b2417d213d322517) store: fix shared etcd key defaults
+ - [`8349d06`](https://github.com/deis/deis/commit/8349d06fe8eeee5a0c29fdeced263bc515994b87) router: check if there is certificates to generate
+ - [`5dd03e8`](https://github.com/deis/deis/commit/5dd03e8705d82877ec731cd69df1b77f481921be) contrib/coreos: remove custom clock sync logic
+ - [`7c8c60b`](https://github.com/deis/deis/commit/7c8c60ba71a344c396cb66c54fb0cedd4792065d) client: add requirements.txt to pypi distribution
+ - [`575f68d`](https://github.com/deis/deis/commit/575f68dfe3c4a14be0add9d28bfcaeb7af29047d) store: lower number of placement groups
+
 ### v1.5.2 -> v1.6.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.6.0-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.6.0)
+[![Current Release](http://img.shields.io/badge/release-v1.6.1-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.6.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
@@ -52,7 +52,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.6.0'
+      ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.6.1'
   - name: debug-etcd.service
     content: |
       [Unit]
@@ -86,7 +86,7 @@ coreos:
 write_files:
   - path: /etc/deis-release
     content: |
-      DEIS_RELEASE=v1.6.0
+      DEIS_RELEASE=v1.6.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/_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.6.0
+    $ git checkout v1.6.1
 
 Check out the latest Deis release, rather than using the default (master).
 
diff --git a/docs/contributing/releases.rst b/docs/contributing/releases.rst
@@ -179,7 +179,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.3.rst \
       docs/troubleshooting_deis/index.rst
 
   - ``git commit -a -m 'chore(release): update version in master to vA.B.D'``
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.6.0
+    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.6.1
     $ # on CoreOS, add "sudo" to install to /opt/bin/deisctl
-    $ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.6.0
+    $ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.6.1
 
-This installs ``deisctl`` version 1.6.0 to the current directory, and downloads the matching
+This installs ``deisctl`` version 1.6.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.6.0-linux-amd64.run
+   :target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.6.1-linux-amd64.run
 
 .. image:: download-osx-brightgreen.svg
-   :target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.6.0-darwin-amd64.run
+   :target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.6.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.6.0
+    1.6.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.6.0
+    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.6.1
     $ deisctl --version  # should match the desired platform
-    1.6.0
-    $ deisctl config platform set version=v1.6.0
+    1.6.1
+    $ deisctl config platform set version=v1.6.1
     $ deisctl install platform
     $ deisctl start platform
 
diff --git a/docs/reference/api-v1.3.rst b/docs/reference/api-v1.3.rst
diff --git a/docs/troubleshooting_deis/index.rst b/docs/troubleshooting_deis/index.rst
