Merge pull request #2152 from mboersma/bump-0.13.1

chore(release): update version to v0.13.1

Author: mboersma

CHANGELOG.md

@@ -1,3 +1,42 @@
+### v0.13.0 -> v0.13.1
+
+#### Features
+
+ - [`5688c6b`](https://github.com/deis/deis/commit/5688c6b3def8a45ab76e366c30e0793660df5f82) builder: inject GIT_SHA into builder apps
+ - [`2c50d5c`](https://github.com/deis/deis/commit/2c50d5c2c7bf34f26b2f6e605673a78cc3602602) client: add loading info msg to run command
+ - [`91164f6`](https://github.com/deis/deis/commit/91164f6d5c6fd9ec632d505a480d84cfe3f4eb97) registry: image without development libraries to reduce the size.
+ - [`da80165`](https://github.com/deis/deis/commit/da80165693661ccb0df4a3944bad024cd0043d6f) contrib/util: add script to generate project contributors
+
+#### Fixes
+
+ - [`91cdd70`](https://github.com/deis/deis/commit/91cdd704cb629b6686700e2a427a4b9ad4533cfe) builder: use proper dockerfile syntax
+ - [`bb352b4`](https://github.com/deis/deis/commit/bb352b48449cb08831c9f9126adc8d0b77a2279d) controller: use build tag if present
+ - [`8418141`](https://github.com/deis/deis/commit/8418141d64dd5eb4288f3bfecb7b7bbbe5527036) controller: do not commit to latest
+ - [`b65e499`](https://github.com/deis/deis/commit/b65e4995129c7c62a6224c81a68e2823f1bac370) controller: inject config on top of existing environment
+ - [`f98fea6`](https://github.com/deis/deis/commit/f98fea634784f8e8077a4be130e10302daaa3ce9) controller: don't clone run containers on deploy
+ - [`2b8aa07`](https://github.com/deis/deis/commit/2b8aa07ee34d2e46730d7c0436531b355afe874c) controller: set default config owner to request.user
+ - [`70da474`](https://github.com/deis/deis/commit/70da474dd73dc749f9913f87d7f1a8cb38d5556a) deisctl: control plane components should restart on failure
+ - [`2084164`](https://github.com/deis/deis/commit/20841647809d178e4d1428a4b2b5ccf1c722bdbb) controller: include message to avoid confusion building the component
+ - [`7f6c202`](https://github.com/deis/deis/commit/7f6c20295d4b16ad9705bfeae2af1106f337e534) builder: properly parse config vars
+ - [`d63aa6d`](https://github.com/deis/deis/commit/d63aa6de73dde746a4f55b89a273ab03a1d7cd5f) controller: retrieve logs via GET request
+ - [`e310501`](https://github.com/deis/deis/commit/e310501ef0ea6426e2d5ac5078e150d90ea7302b) controller: properly serialize JSONField objects
+ - [`dac9161`](https://github.com/deis/deis/commit/dac91613ecb0bc7476650c91a5dad9386c4613f2) logger: the test is expecting the message "deis-logger running".
+ - [`d925056`](https://github.com/deis/deis/commit/d925056a83b573bc87c03b8467911aab0d605d36) controller/tests: add fleet socket to controller tests
+ - [`9bf5e8e`](https://github.com/deis/deis/commit/9bf5e8e5a5b3ced96e625b2a516ac212a1c9d5ff) registry: use YAML's nil type
+ - [`250e7cc`](https://github.com/deis/deis/commit/250e7cc9e0f0aa3513cdf1dae9002172a968b748) registry: make deis-cache mandatory
+ - [`1fd537b`](https://github.com/deis/deis/commit/1fd537b86324b9ad8e38d02f35dbff7ca8129bdc) README: update current version in badge
+ - [`b8c40a6`](https://github.com/deis/deis/commit/b8c40a64d7c247c693c8a1e5dbf0d27e4c52001b) deisctl: update `deisctl --version` string
+
+#### Documentation
+
+ - [`c2eb07d`](https://github.com/deis/deis/commit/c2eb07dd5936806f3a19b4267887419a01fd286a) README: add build status badge for CI test-master job
+ - [`1e7ce1d`](https://github.com/deis/deis/commit/1e7ce1df0451f0a4976ee06f9a04cfa3616fff0a) managing_deis: update controller_settings.
+
+#### Maintenance
+
+ - [`b9db46a`](https://github.com/deis/deis/commit/b9db46a53511f9a7f6f44d7bb5d5d44673ee528d) publisher: Add missing deploy target
+ - [`c1c66f9`](https://github.com/deis/deis/commit/c1c66f97afc3b99d6f20e07619dfa410d3cc81ac) deisctl: remove redundant CHANGELOG.md
+
 ### v0.12.0 -> v0.13.0
 
 #### Features

README.md

@@ -3,11 +3,11 @@
 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](http://ci.deis.io/buildStatus/icon?job=test-master)](http://ci.deis.io/job/test-master/)
-[![Current Release](http://img.shields.io/badge/release-v0.13.0-blue.svg)](https://github.com/deis/deis/releases/tag/v0.13.0)
+[![Current Release](http://img.shields.io/badge/release-v0.13.1-blue.svg)](https://github.com/deis/deis/releases/tag/v0.13.1)
 
 ![Deis Graphic](https://s3-us-west-2.amazonaws.com/deis-images/deis-graphic.png)
 
-Deis is pre-release software. The current release is [v0.13.0](https://github.com/deis/deis/tree/v0.13.0). Until there is a stable release, we recommend you check out the latest ["master" branch](https://github.com/deis/deis) code and refer to the [latest documentation](http://docs.deis.io/en/latest/).  Upgrading from a previous Deis release? See [Upgrading Deis](http://docs.deis.io/en/latest/installing_deis/upgrading-deis/) for additional information.
+Deis is pre-release software. The current release is [v0.13.1](https://github.com/deis/deis/tree/v0.13.1). Until there is a stable release, we recommend you check out the latest ["master" branch](https://github.com/deis/deis) code and refer to the [latest documentation](http://docs.deis.io/en/latest/).  Upgrading from a previous Deis release? See [Upgrading Deis](http://docs.deis.io/en/latest/installing_deis/upgrading-deis/) for additional information.
 
 # Deploying Deis
 

client/deis.py

@@ -69,7 +69,7 @@
 import requests
 from termcolor import colored
 
-__version__ = '0.13.0'
+__version__ = '0.13.1'
 
 
 locale.setlocale(locale.LC_ALL, '')

client/setup.py

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

contrib/coreos/user-data

@@ -50,11 +50,11 @@ coreos:
 
       [Service]
       Type=oneshot
-      ExecStart=/usr/bin/sh -c 'curl -sSL http://deis.io/deisctl/install.sh | sh -s 0.13.0'
+      ExecStart=/usr/bin/sh -c 'curl -sSL http://deis.io/deisctl/install.sh | sh -s 0.13.1'
 write_files:
   - path: /etc/deis-release
     content: |
-      DEIS_RELEASE=v0.13.0
+      DEIS_RELEASE=v0.13.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

controller/deis/__init__.py

@@ -6,4 +6,4 @@
 
 from __future__ import absolute_import
 
-__version__ = '0.13.0'
+__version__ = '0.13.1'

deisctl/README.md

@@ -17,8 +17,8 @@ to *$HOME/.deis/units* one time. You should move `deisctl` somewhere in your $PA
 
 To change installation options, save the installer directly from one of these links:
 
-[![Download for Linux](http://img.shields.io/badge/download-Linux-brightgreen.svg?style=flat)](https://s3-us-west-2.amazonaws.com/opdemand/deisctl-0.13.0-dev-linux-amd64.run)
-[![Download for Mac OS X](http://img.shields.io/badge/download-Mac%20OS%20X-brightgreen.svg?style=flat)](https://s3-us-west-2.amazonaws.com/opdemand/deisctl-0.13.0-dev-darwin-amd64.run)
+[![Download for Linux](http://img.shields.io/badge/download-Linux-brightgreen.svg?style=flat)](https://s3-us-west-2.amazonaws.com/opdemand/deisctl-0.13.1-dev-linux-amd64.run)
+[![Download for Mac OS X](http://img.shields.io/badge/download-Mac%20OS%20X-brightgreen.svg?style=flat)](https://s3-us-west-2.amazonaws.com/opdemand/deisctl-0.13.1-dev-darwin-amd64.run)
 
 Then run the downloaded file as a shell script. Append `--help` to see what options
 are available.
@@ -30,7 +30,7 @@ using a specific Deis release (not latest), you'll want to use the deisctl built
 
 Builds are hosted on an S3 bucket at this URL format: `https://s3-us-west-2.amazonaws.com/opdemand/deisctl-<VERSION>-<darwin|linux>-amd64.run`
 
-The deisctl release for Deis version 0.13 can be downloaded here: [Mac OS X](https://s3-us-west-2.amazonaws.com/opdemand/deisctl-0.13.0-darwin-amd64.run) | [Linux](https://s3-us-west-2.amazonaws.com/opdemand/deisctl-0.13.0-linux-amd64.run)
+The deisctl release for Deis version 0.13 can be downloaded here: [Mac OS X](https://s3-us-west-2.amazonaws.com/opdemand/deisctl-0.13.1-darwin-amd64.run) | [Linux](https://s3-us-west-2.amazonaws.com/opdemand/deisctl-0.13.1-linux-amd64.run)
 
 ### Building from source
 

deisctl/deis-version

@@ -1 +1 @@
-0.13.0
+0.13.1

deisctl/deisctl.go

@@ -14,7 +14,7 @@ import (
 
 const (
 	// Version of deisctl client
-	Version string = "0.13.0"
+	Version string = "0.13.1"
 )
 
 func exit(err error, code int) {

tests/bin/test-latest.sh

@@ -24,13 +24,13 @@ log_phase "Installing clients"
 
 # install deis CLI from http://deis.io/ website
 pushd $DEIS_ROOT/deisctl
-curl -sSL http://deis.io/deis-cli/install.sh | sh -s 0.13.0
+curl -sSL http://deis.io/deis-cli/install.sh | sh -s 0.13.1
 popd
 
 # install deisctl from http://deis.io/ website
 # installs latest unit files to $HOME/.deis/units
 pushd $DEIS_ROOT/client
-curl -sSL http://deis.io/deisctl/install.sh | sh -s 0.13.0
+curl -sSL http://deis.io/deisctl/install.sh | sh -s 0.13.1
 popd
 
 # ensure we use distributed unit files