chore(release): update version to v1.5.2

mikong · Apr 22, 2015 · 63c0c93 · 63c0c93
1 parent 8e705e4
commit 63c0c93
Show file tree

Hide file tree

Showing 25 changed files with 41 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+### v1.5.1 -> v1.5.2
+
+#### Fixes
+
+ - [`a4bf040`](https://github.com/deis/deis/commit/a4bf040b5982dee6b92bfd4cfdfb3d57f30cdba2) router: include deis.conf if no match with an SSL cert
+ - [`1df8eea`](https://github.com/deis/deis/commit/1df8eeaaf0f563d758167c454b2a8f9de612122f) controller: allow "*" wildcard in cert REST URLs
+ - [`7f6099c`](https://github.com/deis/deis/commit/7f6099c865c7a48f88b435cfad01f435251208e2) controller: return the correct domain from get_object
+ - [`02b78a2`](https://github.com/deis/deis/commit/02b78a258c93d1caa149be2dbf313a097552485f) router: write out only if cert matches the path
+ - [`8e960ca`](https://github.com/deis/deis/commit/8e960ca203bd5d8c48e129c4172dd2b13cdc4439) (all): use "confd --interval 5" instead of "--watch"
+
 ### v1.5.0 -> v1.5.1
 
 #### Fixes

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

diff --git a/builder/image/Dockerfile b/builder/image/Dockerfile
@@ -63,4 +63,4 @@ ADD etc /etc
 ADD . /app
 RUN chown -R root:root /app
 
-ENV DEIS_RELEASE 1.5.1
+ENV DEIS_RELEASE 1.5.2
diff --git a/builder/image/slugbuilder/Dockerfile b/builder/image/slugbuilder/Dockerfile
@@ -12,5 +12,5 @@ ADD ./builder/ /tmp/builder
 RUN /tmp/builder/install-buildpacks
 ENTRYPOINT ["/tmp/builder/build.sh"]
 
-ENV DEIS_RELEASE 1.5.1
+ENV DEIS_RELEASE 1.5.2
 
diff --git a/builder/image/slugrunner/Dockerfile b/builder/image/slugrunner/Dockerfile
@@ -18,5 +18,5 @@ USER slug
 ENV HOME /app
 ENTRYPOINT ["/runner/init"]
 
-ENV DEIS_RELEASE 1.5.1
+ENV DEIS_RELEASE 1.5.2
 
diff --git a/cache/image/Dockerfile b/cache/image/Dockerfile
@@ -6,4 +6,4 @@ WORKDIR /app
 CMD ["/app/bin/boot"]
 EXPOSE 6379
 
-ENV DEIS_RELEASE 1.5.1
+ENV DEIS_RELEASE 1.5.2
diff --git a/client/deis.py b/client/deis.py
@@ -72,7 +72,7 @@
 from tabulate import tabulate
 from termcolor import colored
 
-__version__ = '1.5.1'
+__version__ = '1.5.2'
 
 # what version of the API is this client compatible with?
 __api_version__ = '1.2'

diff --git a/client/setup.py b/client/setup.py
@@ -28,7 +28,7 @@
 
 
 setup(name='deis',
-      version='1.5.1',
+      version='1.5.2',
       license=APACHE_LICENSE,
       description='Command-line Client for Deis, the open PaaS',
       author='OpDemand',

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.1'
+      ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.5.2'
   - 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.1
+      DEIS_RELEASE=v1.5.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

diff --git a/controller/Dockerfile b/controller/Dockerfile
@@ -31,4 +31,4 @@ ADD . /app
 # Create static resources
 RUN /app/manage.py collectstatic --settings=deis.settings --noinput
 
-ENV DEIS_RELEASE 1.5.1
+ENV DEIS_RELEASE 1.5.2
diff --git a/controller/deis/__init__.py b/controller/deis/__init__.py
@@ -6,4 +6,4 @@
 
 from __future__ import absolute_import
 
-__version__ = '1.5.1'
+__version__ = '1.5.2'
diff --git a/database/Dockerfile b/database/Dockerfile
@@ -22,5 +22,5 @@ CMD ["/app/bin/boot"]
 EXPOSE 5432
 ADD . /app
 
-ENV DEIS_RELEASE 1.5.1
+ENV DEIS_RELEASE 1.5.2
 
diff --git a/deisctl/cmd/cmd.go b/deisctl/cmd/cmd.go
@@ -620,7 +620,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.5.1]
+                       [default: v1.5.2]
 `
 	// parse command-line arguments
 	args, err := docopt.Parse(usage, argv, true, "", false)

diff --git a/deisctl/deis-version b/deisctl/deis-version
@@ -1 +1 @@
-1.5.1
+1.5.2
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.1
+    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.5.2
     $ # on CoreOS, add "sudo" to install to /opt/bin/deisctl
-    $ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.5.1
+    $ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.5.2
 
-This installs ``deisctl`` version 1.5.1 to the current directory, and downloads the matching
+This installs ``deisctl`` version 1.5.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``:
 
@@ -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.1-linux-amd64.run
+   :target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.5.2-linux-amd64.run
 
 .. image:: download-osx-brightgreen.svg
-   :target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.5.1-darwin-amd64.run
+   :target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.5.2-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.1
+    1.5.2
 
 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.1
+    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.5.2
     $ deisctl --version  # should match the desired platform
-    1.5.1
-    $ deisctl config platform set version=v1.5.1
+    1.5.2
+    $ deisctl config platform set version=v1.5.2
     $ 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.1``, or set the ``$DEISCTL_UNITS`` environment variable to a directory
+``deisctl refresh-units --tag=v1.5.2``, or set the ``$DEISCTL_UNITS`` environment variable to a directory
 containing the unit files.
 
 Other issues

diff --git a/logger/image/Dockerfile b/logger/image/Dockerfile
@@ -5,5 +5,5 @@ EXPOSE 514
 
 ADD . /
 
-ENV DEIS_RELEASE 1.5.1
+ENV DEIS_RELEASE 1.5.2
 
diff --git a/logspout/image/Dockerfile b/logspout/image/Dockerfile
@@ -7,5 +7,5 @@ CMD ["/bin/logspout"]
 
 ADD logspout /bin/logspout
 
-ENV DEIS_RELEASE 1.5.1
+ENV DEIS_RELEASE 1.5.2
 
diff --git a/publisher/image/Dockerfile b/publisher/image/Dockerfile
@@ -3,5 +3,5 @@ FROM ubuntu-debootstrap:14.04
 ADD bin/publisher /usr/local/bin/publisher
 ENTRYPOINT ["/usr/local/bin/publisher"]
 
-ENV DEIS_RELEASE 1.5.1
+ENV DEIS_RELEASE 1.5.2
 
diff --git a/registry/Dockerfile b/registry/Dockerfile
@@ -27,4 +27,4 @@ RUN DOCKER_BUILD=true /app/build.sh
 
 ADD . /app
 
-ENV DEIS_RELEASE 1.5.1
+ENV DEIS_RELEASE 1.5.2
diff --git a/router/image/Dockerfile b/router/image/Dockerfile
@@ -24,5 +24,5 @@ ADD nginx.tgz /opt/nginx
 
 RUN rm nginx.tgz
 
-ENV DEIS_RELEASE 1.5.1
+ENV DEIS_RELEASE 1.5.2
 
diff --git a/store/base/Dockerfile b/store/base/Dockerfile
@@ -9,5 +9,5 @@ RUN DOCKER_BUILD=true /tmp/build.sh
 # Add shared confd configuration
 ADD . /app
 
-ENV DEIS_RELEASE 1.5.1
+ENV DEIS_RELEASE 1.5.2
 
diff --git a/version/version.go b/version/version.go
@@ -1,4 +1,4 @@
 package version
 
 // Version identifies this Deis product revision.
-const Version = "1.5.1"
+const Version = "1.5.2"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@

		from __future__ import absolute_import

		__version__ = '1.5.1'
		__version__ = '1.5.2'
-Original file line number
+Diff line change
@@ Expand Up @@
     .. code-block:: console
         $ deisctl --version
-.5.1
+.5.2
     If not, follow instructions to :ref:`install_deisctl`.
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,5 +5,5 @@ EXPOSE 514

		ADD . /

		ENV DEIS_RELEASE 1.5.1
		ENV DEIS_RELEASE 1.5.2
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,5 +7,5 @@ CMD ["/bin/logspout"]

		ADD logspout /bin/logspout

		ENV DEIS_RELEASE 1.5.1
		ENV DEIS_RELEASE 1.5.2
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,4 +27,4 @@ RUN DOCKER_BUILD=true /app/build.sh

		ADD . /app

		ENV DEIS_RELEASE 1.5.1
		ENV DEIS_RELEASE 1.5.2
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,5 +24,5 @@ ADD nginx.tgz /opt/nginx

		RUN rm nginx.tgz

		ENV DEIS_RELEASE 1.5.1
		ENV DEIS_RELEASE 1.5.2