chore(release): update version to v1.2.2

CHANGELOG.md

@@ -1,3 +1,10 @@
+### v1.2.1 -> v1.2.2
+
+#### Fixes
+
+ - [`97d9406`](https://github.com/deis/deis/commit/97d9406f397cbf794b39a133a408fb0aa2900731) database: fix build because of python-daemon
+ - [`5d508c6`](https://github.com/deis/deis/commit/5d508c6882e6767f8d9c2982d004881b1d644185) builder: allow procfile to override default process types
+
 ### v1.2.0 -> v1.2.1
 
 #### Maintenance

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.2.1-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.2.1)
+[![Current Release](http://img.shields.io/badge/release-v1.2.2-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.2.2)
 [![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)

client/deis.py

@@ -69,7 +69,7 @@
 import requests
 from termcolor import colored
 
-__version__ = '1.2.1'
+__version__ = '1.2.2'
 
 # what version of the API is this client compatible with?
 __api_version__ = '1.1'

client/setup.py

@@ -28,7 +28,7 @@
 
 
 setup(name='deis',
-      version='1.2.1',
+      version='1.2.2',
       license=APACHE_LICENSE,
       description='Command-line Client for Deis, the open PaaS',
       author='OpDemand',

contrib/coreos/user-data.example

@@ -40,7 +40,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.2.1'
+      ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.2.2'
   - name: ntpdate.service
     command: start
   - name: timedate-ntp-synchronization.service
@@ -68,7 +68,7 @@ coreos:
 write_files:
   - path: /etc/deis-release
     content: |
-      DEIS_RELEASE=v1.2.1
+      DEIS_RELEASE=v1.2.2
   - 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

controller/deis/__init__.py

@@ -6,4 +6,4 @@
 
 from __future__ import absolute_import
 
-__version__ = '1.2.1'
+__version__ = '1.2.2'

deisctl/cmd/cmd.go

@@ -626,7 +626,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: v1.2.1]
+                       [default: v1.2.2]
 `
 	// parse command-line arguments
 	args, err := docopt.Parse(usage, argv, true, "", false)

deisctl/deis-version

@@ -1 +1 @@
-1.2.1
+1.2.2

docs/installing_deis/install-deisctl.rst

@@ -18,9 +18,9 @@ and run the latest installer:
 .. code-block:: console
 
     $ cd ~/bin
-    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.2.1
+    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.2.2
 
-This installs ``deisctl`` version 1.2.1 to the current directory, and downloads the matching
+This installs ``deisctl`` version 1.2.2 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``:
 
@@ -31,10 +31,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.2.1-linux-amd64.run
+   :target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.2.2-linux-amd64.run
 
 .. image:: download-osx-brightgreen.svg
-   :target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.2.1-darwin-amd64.run
+   :target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.2.2-darwin-amd64.run
 
 Then run the downloaded file as a shell script. Append ``--help`` to see what options
 are available.

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.2.1
+    1.2.2
 
 If not, follow instructions to :ref:`install_deisctl`.
 

docs/managing_deis/upgrading-deis.rst

@@ -56,10 +56,10 @@ Finally, update ``deisctl`` to the new version and reinstall:
 
 .. code-block:: console
 
-    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.2.1
+    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.2.2
     $ deisctl --version  # should match the desired platform
-    1.2.1
-    $ deisctl config platform set version=v1.2.1
+    1.2.2
+    $ deisctl config platform set version=v1.2.2
     $ deisctl install platform
     $ deisctl start platform
 

docs/reference/api-v1.1.rst

@@ -55,7 +55,7 @@ Example Response:
 
     HTTP/1.1 201 CREATED
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
 
     {
@@ -93,7 +93,7 @@ Example Response:
 
     HTTP/1.1 200 OK
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
 
     {"token": "abc123"}
@@ -116,7 +116,7 @@ Example Response:
 
     HTTP/1.1 204 NO CONTENT
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
 
 
 Applications
@@ -140,7 +140,7 @@ Example Response:
 
     HTTP/1.1 200 OK
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
 
     {
@@ -186,7 +186,7 @@ Example Response:
 
     HTTP/1.1 201 CREATED
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
 
     {
@@ -217,7 +217,7 @@ Example Response:
 
     HTTP/1.1 204 NO CONTENT
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
 
 
 List Application Details
@@ -237,7 +237,7 @@ Example Response:
 
     HTTP/1.1 200 OK
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
 
     {
@@ -268,7 +268,7 @@ Example Response:
 
     HTTP/1.1 200 OK
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: text/plain
 
     "16:51:14 deis[api]: test created initial release\n"
@@ -292,7 +292,7 @@ Example Response:
 
     HTTP/1.1 200 OK
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
 
     {"rc": 0, "output": "hi"}
@@ -319,7 +319,7 @@ Example Response:
 
     HTTP/1.1 200 OK
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
 
     {
@@ -359,7 +359,7 @@ Example Response:
 
     HTTP/1.1 200 OK
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
 
     {
@@ -402,7 +402,7 @@ Example Response:
 
     HTTP/1.1 204 NO CONTENT
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
 
 
 Configuration
@@ -426,7 +426,7 @@ Example Response:
 
     HTTP/1.1 200 OK
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
 
     {
@@ -462,7 +462,7 @@ Example Response:
 
     HTTP/1.1 201 CREATED
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
     X-Deis-Release: 3
 
@@ -505,7 +505,7 @@ Example Response:
 
     HTTP/1.1 201 CREATED
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
     X-Deis-Release: 4
 
@@ -547,7 +547,7 @@ Example Response:
 
     HTTP/1.1 200 OK
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
 
     {
@@ -585,7 +585,7 @@ Example Response:
 
     HTTP/1.1 201 CREATED
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
 
     {
@@ -615,7 +615,7 @@ Example Response:
 
     HTTP/1.1 204 NO CONTENT
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
 
 
 Builds
@@ -639,7 +639,7 @@ Example Response:
 
     HTTP/1.1 200 OK
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
 
     {
@@ -684,7 +684,7 @@ Example Response:
 
     HTTP/1.1 201 CREATED
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
     X-Deis-Release: 4
 
@@ -722,7 +722,7 @@ Example Response:
 
     HTTP/1.1 200 OK
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
 
     {
@@ -784,7 +784,7 @@ Example Response:
 
     HTTP/1.1 200 OK
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
 
     {
@@ -820,7 +820,7 @@ Example Response:
 
     HTTP/1.1 201 CREATED
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
 
     {"version": 5}
@@ -847,7 +847,7 @@ Example Response:
 
     {
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
         "count": 1,
         "next": null,
         "previous": null,
@@ -886,7 +886,7 @@ Example Response:
 
     HTTP/1.1 201 CREATED
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
 
     {
@@ -916,7 +916,7 @@ Example Response:
 
     HTTP/1.1 204 NO CONTENT
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
 
 
 Permissions
@@ -940,7 +940,7 @@ Example Response:
 
     HTTP/1.1 200 OK
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
     Content-Type: application/json
 
     {
@@ -967,7 +967,7 @@ Example Response:
 
     HTTP/1.1 201 CREATED
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
 
 
 Remove Application Permission
@@ -987,7 +987,7 @@ Example Response:
 
     HTTP/1.1 204 NO CONTENT
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2
 
 Grant User Administrative Privileges
 ````````````````````````````````````
@@ -1012,4 +1012,4 @@ Example Response:
 
     HTTP/1.1 201 CREATED
     X_DEIS_API_VERSION: 1.1
-    X_DEIS_PLATFORM_VERSION: 1.2.1
+    X_DEIS_PLATFORM_VERSION: 1.2.2

docs/troubleshooting_deis/index.rst

@@ -170,7 +170,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.2.1``, or set the ``$DEISCTL_UNITS`` environment variable to a directory
+``deisctl refresh-units --tag=v1.2.2``, or set the ``$DEISCTL_UNITS`` environment variable to a directory
 containing the unit files.
 
 Other issues