Merge pull request #2231 from mboersma/release-v0.14.0

mboersma · mboersma · commit 59cfb191ae11 · 2014-10-22T12:05:02.000-06:00
chore(release): update version to v0.14.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,66 @@
+### v0.13.1 -> v0.14.0
+
+#### Features
+
+ - [`85c4d07`](https://github.com/deis/deis/commit/85c4d070648f70c7d007e9ee1c1c3fc487923496) controller: bump API to v1
+ - [`0b21d49`](https://github.com/deis/deis/commit/0b21d49e961ed102c520956bb5d875ebe7d37631) Vagrantfile: use "virtio" network devices by default
+ - [`8881a7b`](https://github.com/deis/deis/commit/8881a7bafed270b21faeb83f5b3ed31b5652647c) client: add auth:whoami
+ - [`90fb6e1`](https://github.com/deis/deis/commit/90fb6e1045a6d93ed0d9a2accfe7a1d5f3d28ec1) registry: image without development libraries to reduce the size.
+
+#### Fixes
+
+ - [`e61082d`](https://github.com/deis/deis/commit/e61082df0b25c48e4739183f0a6b9d215dbf0917) client: search for tag
+ - [`3894f81`](https://github.com/deis/deis/commit/3894f81f344904e0ad79a9bcfa02c1603be74496) docs: update requirements in sync with controller
+ - [`bca8724`](https://github.com/deis/deis/commit/bca87240702de0eacf41cea3d2af12b75a12bcc4) controller: ISO8601 datetime compliance
+ - [`7bcf6f1`](https://github.com/deis/deis/commit/7bcf6f191037d797a5a0a7210873efe889600f10) logspout: add timezone to logs
+ - [`48c7635`](https://github.com/deis/deis/commit/48c763531437c8ce6d5e3348859c6d33ca3ac956) client: remove timezone parsing"
+ - [`87460b8`](https://github.com/deis/deis/commit/87460b869537f556d92d3ae9a7304739918a0909) controller: add timezone to datetime format
+ - [`7e658c4`](https://github.com/deis/deis/commit/7e658c406dbe4709cf05ccaea70d6ca23f9f6620) builder: work around 0-byte ADD layer by ignoring tar timestamps
+ - [`077b079`](https://github.com/deis/deis/commit/077b079bb606aa67c142c01dcfeeece2cc39db4c) tests: use streamOutput for test runs
+ - [`77c8c18`](https://github.com/deis/deis/commit/77c8c1832a7af569d3a13f0279fe2206a7155943) client: re-parse docopt
+ - [`822f1d8`](https://github.com/deis/deis/commit/822f1d83262513b4186b7d229fde530a19491343) logger: remove logger-build container after "docker cp"
+ - [`0b9bd3b`](https://github.com/deis/deis/commit/0b9bd3bce8b16206ea9a8cd7cca3610ad840600d) controller: deploy only when Build is present
+ - [`c69151a`](https://github.com/deis/deis/commit/c69151ab43b1d0c9711ff0e562d76abd979fea5e) builder: validate that properly formed slugs are added correctly
+ - [`f2a476d`](https://github.com/deis/deis/commit/f2a476dac87fc0129a526206cf0b72b3007f3c4f) client: remove timezone parsing
+ - [`0c81025`](https://github.com/deis/deis/commit/0c81025a3700aa0fa60a1c083868d0e0d5ec0ec4) controller: standardize API datetime field format
+ - [`f4776f8`](https://github.com/deis/deis/commit/f4776f8ea37fbb3c40578f06efd98ec289a25f6c) builder: escape to avoid errors in serialization of Dockerfile
+ - [`861b026`](https://github.com/deis/deis/commit/861b026ea28b67108bb6e524697c12aa9d08cc1c) tests: make curl loop a few times
+ - [`3af7364`](https://github.com/deis/deis/commit/3af7364d207b0840028ee1e49ed0c912d2ac02a2) registry: use docker cache
+ - [`4b536a7`](https://github.com/deis/deis/commit/4b536a7bd80bd8e12135f11efd521bb380222e61) controller: revert requests retry
+ - [`387dfa0`](https://github.com/deis/deis/commit/387dfa0f67990614bee54ceb32e0275a4c571bd8) deisctl: optimize platform start order
+ - [`8d647dc`](https://github.com/deis/deis/commit/8d647dca0658744f807c1ad9d23be32db271f439) controller: safe_mkdir /deis/domains as part of init
+ - [`14e0ad9`](https://github.com/deis/deis/commit/14e0ad9c771933031b010b93a5b060aeaac8705a) (all): remove deprecated @1 unit names
+ - [`dfcfba3`](https://github.com/deis/deis/commit/dfcfba3f4087699ead05394b203a535a300af87a) controller: add default retries to scheduler
+ - [`cdb75ed`](https://github.com/deis/deis/commit/cdb75ed2ab72ed41e08f3e3c5e63153fad43de02) database: reset permissions before initdb
+ - [`d5f922a`](https://github.com/deis/deis/commit/d5f922a266b34b9ebc3a1078542c20f19abf814b) controller: use deis-logger for requires
+ - [`143f3c6`](https://github.com/deis/deis/commit/143f3c68336c451548bba3447c0c986725d8623e) deisctl: force container removal in ExecStopPort
+ - [`d9367d1`](https://github.com/deis/deis/commit/d9367d105471e2eb4949967d41af75e085e6ab9a) deisctl: ignore units that dont exist on destroy
+ - [`702e9a7`](https://github.com/deis/deis/commit/702e9a773eed9d51bc1e628ef76890e623711633) database: initdb if not already initialized
+ - [`c3c019c`](https://github.com/deis/deis/commit/c3c019c34a9b0899b83033948eeea13262c43d22) deisctl: dont print newlines for global units
+ - [`bca8eb4`](https://github.com/deis/deis/commit/bca8eb480dfd45414bb6febed200bdc575715f60) controller: use docker cache
+ - [`5ac8e58`](https://github.com/deis/deis/commit/5ac8e587582fbe5928cac90fc14cafa22b9b5393) logger: kill temporary build container in "make build"
+ - [`f34b355`](https://github.com/deis/deis/commit/f34b3558544953f67bf3b89c56999dde8b351642) auth: use djangorestframework login/logout views
+ - [`5c8d9d3`](https://github.com/deis/deis/commit/5c8d9d3ff9796af70f6294d1cbd677eeb97ef664) builder: do not accept variables from the client
+
+#### Documentation
+
+ - [`6ca1293`](https://github.com/deis/deis/commit/6ca1293a97f738ac5ab85aa9c1e53ef6f26751f3) managing_deis: fix deisctl config set examples
+ - [`aee7c7c`](https://github.com/deis/deis/commit/aee7c7cc60a5426d83cb7b1aaac30824a97b028b) deisctl: update with new output
+ - [`486d55c`](https://github.com/deis/deis/commit/486d55c37f7858af66dc81c5a3ae77dd21a5307f) upgrade: add in-place upgrade docs, refactor migration upgrade docs
+
+#### Maintenance
+
+ - [`4cd4095`](https://github.com/deis/deis/commit/4cd40950d8b1cab8de3452f3c8a80bc4eeb914cb) release: update version to v0.14.0
+ - [`bb5bc9e`](https://github.com/deis/deis/commit/bb5bc9e1f778748745ab2657c37d2820033a68dd) (all): bump CoreOS to 472.0.0
+ - [`dadfd1b`](https://github.com/deis/deis/commit/dadfd1b9f4dfa405291af52903a6ac40287123eb) deisctl: switch data containers to ubuntu-debootstrap:14.04
+ - [`a564287`](https://github.com/deis/deis/commit/a564287d071b902f416e54755ebab4a9fda58f6c) deisctl: bump godeps for coreos/fleet
+ - [`d40b1b3`](https://github.com/deis/deis/commit/d40b1b31fb5496ec6ece26126dfd9116bd9f01c7) store: add start delay on OSD recovery
+ - [`6ea8d57`](https://github.com/deis/deis/commit/6ea8d5759b296c9d8454baedf73c42b09eff61a6) builder: update Docker engine to 1.3.0
+ - [`7ba9b17`](https://github.com/deis/deis/commit/7ba9b17a4880270660c7c9a3e0840c4e4be39aed) controller: update json-field to 0.5.7
+ - [`0394cf3`](https://github.com/deis/deis/commit/0394cf3eac3f410e8f2cc4f6a279388d16090090) controller: update psycopg to 2.5.4
+ - [`903721b`](https://github.com/deis/deis/commit/903721b5592054d0a4e456c6022fbbb98eeb5ed0) controller: remove unused django-allauth app
+ - [`d67179b`](https://github.com/deis/deis/commit/d67179b4fe716d540565bdc838416ca1b766b177) (all): bump CoreOS to 471.1.0
+
 ### v0.13.0 -> v0.13.1
 
 #### Features
diff --git a/README.md b/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.1-blue.svg)](https://github.com/deis/deis/releases/tag/v0.13.1)
+[![Current Release](http://img.shields.io/badge/release-v0.14.0-blue.svg)](https://github.com/deis/deis/releases/tag/v0.14.0)
 
 ![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.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.
+Deis is pre-release software. The current release is [v0.14.0](https://github.com/deis/deis/tree/v0.14.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.
 
 # Deploying Deis
 
diff --git a/client/deis.py b/client/deis.py
@@ -67,7 +67,7 @@
 import requests
 from termcolor import colored
 
-__version__ = '0.13.1'
+__version__ = '0.14.0'
 
 
 locale.setlocale(locale.LC_ALL, '')
diff --git a/client/setup.py b/client/setup.py
@@ -28,7 +28,7 @@
 
 
 setup(name='deis',
-      version='0.13.1',
+      version='0.14.0',
       license=APACHE_LICENSE,
       description='Command-line Client for Deis, the open PaaS',
       author='OpDemand',
diff --git a/contrib/coreos/user-data b/contrib/coreos/user-data
@@ -50,11 +50,11 @@ coreos:
 
       [Service]
       Type=oneshot
-      ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 0.13.1'
+      ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 0.14.0'
 write_files:
   - path: /etc/deis-release
     content: |
-      DEIS_RELEASE=v0.13.1
+      DEIS_RELEASE=v0.14.0
   - 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/controller/deis/__init__.py b/controller/deis/__init__.py
@@ -6,4 +6,4 @@
 
 from __future__ import absolute_import
 
-__version__ = '0.13.1'
+__version__ = '0.14.0'
diff --git a/deisctl/README.md b/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.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)
+[![Download for Linux](http://img.shields.io/badge/download-Linux-brightgreen.svg?style=flat)](https://s3-us-west-2.amazonaws.com/opdemand/deisctl-0.14.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.14.0-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.1-darwin-amd64.run) | [Linux](https://s3-us-west-2.amazonaws.com/opdemand/deisctl-0.13.1-linux-amd64.run)
+The deisctl release for Deis version 0.14.0 can be downloaded here: [Mac OS X](https://s3-us-west-2.amazonaws.com/opdemand/deisctl-0.14.0-darwin-amd64.run) | [Linux](https://s3-us-west-2.amazonaws.com/opdemand/deisctl-0.14.0-linux-amd64.run)
 
 ### Building from source
 
diff --git a/deisctl/cmd/cmd.go b/deisctl/cmd/cmd.go
@@ -440,7 +440,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: v0.14.0]
 `
 	// parse command-line arguments
 	args, err := docopt.Parse(usage, nil, true, "", false)
diff --git a/deisctl/deis-version b/deisctl/deis-version
@@ -1 +1 @@
-0.13.1
+0.14.0
diff --git a/deisctl/deisctl.go b/deisctl/deisctl.go
@@ -14,7 +14,7 @@ import (
 
 const (
 	// Version of deisctl client
-	Version string = "0.13.1"
+	Version string = "0.14.0"
 )
 
 func exit(err error, code int) {
diff --git a/docs/contributing/releases.rst b/docs/contributing/releases.rst
@@ -14,11 +14,12 @@ deis repo
 - Create the next `deis milestone`_
 - Move any `deis open issues`_ from the current release to the next milestone
 - Close the current `deis milestone`_
+- Create a branch for the release PR: ``git checkout -b release-X.Y.Z``
 - Update CHANGELOG.md using the `changelog script`_
-    * ``./contrib/util/generate-changelog.sh vU.V.W vX.Y.Z | cat - CHANGELOG.md > tmp && mv tmp CHANGELOG.md``
-      substituting the previous release for vU.V.W and the current one for vX.Y.Z.
-    * proofread the new CHANGELOG.md to ensure it was generated correctly
-    * ``git add CHANGELOG.md && git commit -m "docs(CHANGELOG): update for v.X.Y.Z"``
+    * ``./contrib/util/generate-changelog.sh vU.V.W | cat - CHANGELOG.md > tmp && mv tmp CHANGELOG.md``
+      substituting the previous release for vU.V.W.
+    * proofread the new CHANGELOG.md to ensure it was generated correctly and edit ``HEAD`` at the top
+      to vX.Y.Z (the current release)
 - Update version strings with the ``bumpver`` tool:
 
   .. code-block:: console
@@ -30,14 +31,17 @@ deis repo
         deisctl/deis-version \
         deisctl/deisctl.go \
         deisctl/README.md \
+        deisctl/cmd/cmd.go \
         contrib/coreos/user-data \
         controller/deis/__init__.py \
         README.md \
         tests/bin/test-latest.sh
 
 - Commit and push the deis/deis release and tag
     * ``git commit -a -m 'chore(release): update version to vX.Y.Z'``
-    * ``git push origin master``
+    * ``git push origin release-X.Y.Z``
+- When the PR is approved and merged, tag it in master
+    * ``git checkout master && git pull``
     * ``git tag vX.Y.Z``
     * ``git push --tags origin vX.Y.Z``
 - Publish CLI to pypi.python.org
diff --git a/tests/bin/test-latest.sh b/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.1
+curl -sSL http://deis.io/deis-cli/install.sh | sh -s 0.14.0
 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.1
+curl -sSL http://deis.io/deisctl/install.sh | sh -s 0.14.0
 popd
 
 # ensure we use distributed unit files
diff --git a/version/version.go b/version/version.go
@@ -1,3 +1,3 @@
 package version
 
-const Version = "0.13.1"
+const Version = "0.14.0"

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__ = '0.13.1'`
	`9`	`+__version__ = '0.14.0'`
Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ Usage:`
`440`	`440`	`Options:`
`441`	`441`	`-p --path=<target> where to save unit files [default: $HOME/.deis/units]`
`442`	`442`	`-t --tag=<tag> git tag, branch, or SHA to use when downloading unit files`
`443`		`- [default: master]`
	`443`	`+ [default: v0.14.0]`
`444`	`444`	`
`445`	`445`	`// parse command-line arguments`
`446`	`446`	`args, err := docopt.Parse(usage, nil, true, "", false)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`
`15`	`15`	`const (`
`16`	`16`	`// Version of deisctl client`
`17`		`- Version string = "0.13.1"`
	`17`	`+ Version string = "0.14.0"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`func exit(err error, code int) {`