Skip to content

Commit

Permalink
chore(release): update version in master to v1.13.3
Browse files Browse the repository at this point in the history
  • Loading branch information
mboersma committed Aug 22, 2016
1 parent d143b4b commit 9b21fcc
Show file tree
Hide file tree
Showing 11 changed files with 86 additions and 64 deletions.
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
### v1.13.2 -> v1.13.3

#### Features

- [`d369fd7`](https://github.com/deis/deis/commit/d369fd7e811c24d9da4eb907fd1237400cc15114) contrib: Add script to restart all apps.
- [`ef80d81`](https://github.com/deis/deis/commit/ef80d818b01de5e69888192fb855c63374fce9cc) client: Sort listings
- [`968c48c`](https://github.com/deis/deis/commit/968c48c859e92539173032f26aa95afe6478a455) router: Add server_tokens option

#### Fixes

- [`d143b4b`](https://github.com/deis/deis/commit/d143b4bf7ba7cb14236748dc6e421554c95ecba8) logspout: Ignore events with short ID

#### Documentation

- [`6da7204`](https://github.com/deis/deis/commit/6da72045a36a49d6e6c8b4dbe59ff66695cc927d) dockerfiles: Make Bash requirement explicit in the documentation

#### Maintenance

- [`e30db13`](https://github.com/deis/deis/commit/e30db1391800284edf0937d5abfa7956179802af) buildpacks: update go, scala, and php buildpacks
- [`fc1518a`](https://github.com/deis/deis/commit/fc1518a66b9d28d29626696d11be07749cc121a1) (all): update base to alpine:3.4
- [`fd35c66`](https://github.com/deis/deis/commit/fd35c66ab16c4a621e42f2f42da5b66cb2c63cda) planning: add July and August, up next, September
- [`3ef983f`](https://github.com/deis/deis/commit/3ef983f8c5c7c2d57f3261789a15443fb021f22e) (all): bump CoreOS to 1068.8.0
- [`167a44a`](https://github.com/deis/deis/commit/167a44a43880ce47509651c3ee2507e9c4e3abca) buildpacks: update go, php, nodejs, python, and scala buildpacks
- [`8342efc`](https://github.com/deis/deis/commit/8342efc2b78b7691e2578e1ac719953739fea908) roadmap: clarify Deis v1 roadmap status

### v1.13.1 -> v1.13.2

#### Fixes
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,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.13.2-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.13.2)
[![Current Release](http://img.shields.io/badge/release-v1.13.3-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.13.3)
[![Latest Docs](http://img.shields.io/badge/docs-latest-fc1e5e.svg)](http://docs.deis.io/en/latest/)

New to Deis? Learn more about Deis [Concepts](http://docs.deis.io/en/latest/understanding_deis/concepts/), [Architecture](http://docs.deis.io/en/latest/understanding_deis/architecture/) and how to [Deploy an Application](http://docs.deis.io/en/latest/using_deis/deploy-application/).
Expand Down
4 changes: 2 additions & 2 deletions contrib/coreos/user-data.example
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,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.13.2'
ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.13.3'
- name: increase-nf_conntrack-connections.service
command: start
content: |
Expand All @@ -125,7 +125,7 @@ coreos:
write_files:
- path: /etc/deis-release
content: |
DEIS_RELEASE=v1.13.2
DEIS_RELEASE=v1.13.3
- 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
Expand Down
2 changes: 1 addition & 1 deletion contrib/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ function echo_green {

export COREOS_CHANNEL=${COREOS_CHANNEL:-stable}
export COREOS_VERSION=${COREOS_VERSION:-1068.8.0}
export DEIS_RELEASE=1.13.2
export DEIS_RELEASE=1.13.3
2 changes: 1 addition & 1 deletion docs/_includes/_get-the-source.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.2
$ git checkout v1.13.3
Check out the latest Deis release, rather than using the default (master).

Expand Down
10 changes: 5 additions & 5 deletions docs/installing_deis/install-deisctl.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.2
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.13.3
$ # on CoreOS, add "sudo" to install to /opt/bin/deisctl
$ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.13.2
$ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.13.3
This installs ``deisctl`` version 1.13.2 to the current directory, and downloads the matching
This installs ``deisctl`` version 1.13.3 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``:

Expand All @@ -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/get-deis/deisctl-1.13.2-linux-amd64.run
:target: https://s3-us-west-2.amazonaws.com/get-deis/deisctl-1.13.3-linux-amd64.run

.. image:: download-osx-brightgreen.svg
:target: https://s3-us-west-2.amazonaws.com/get-deis/deisctl-1.13.2-darwin-amd64.run
:target: https://s3-us-west-2.amazonaws.com/get-deis/deisctl-1.13.3-darwin-amd64.run

Then run the downloaded file as a shell script. Append ``--help`` to see what options
are available.
Expand Down
2 changes: 1 addition & 1 deletion docs/installing_deis/install-platform.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ First check that you have ``deisctl`` installed and the version is correct.
.. code-block:: console
$ deisctl --version
1.13.2
1.13.3
If not, follow instructions to :ref:`install_deisctl`.

Expand Down
14 changes: 7 additions & 7 deletions docs/managing_deis/upgrading-deis.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.13.2
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.13.3
$ deisctl --version # should match the desired platform
1.13.2
$ deisctl config platform set version=v1.13.2
1.13.3
$ deisctl config platform set version=v1.13.3
$ deisctl install platform
$ deisctl start platform
Expand Down Expand Up @@ -105,11 +105,11 @@ to. Care should be taken not to overwrite the existing ``deisctl`` version.
.. code-block:: console
$ mkdir /tmp/upgrade
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.13.2 /tmp/upgrade
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.13.3 /tmp/upgrade
$ /tmp/upgrade/deisctl --version # should match the desired platform
1.13.2
1.13.3
$ /tmp/upgrade/deisctl refresh-units
$ /tmp/upgrade/deisctl config platform set version=v1.13.2
$ /tmp/upgrade/deisctl config platform set version=v1.13.3
Now it is possible to prepare the cluster for the upgrade using the old ``deisctl`` binary. This command will shutdown
and uninstall all components of the cluster except the router and publisher. This means your services should still be
Expand All @@ -134,7 +134,7 @@ If the process were to fail, the old version can be restored manually by reinsta
$ /tmp/upgrade/deisctl stop platform
$ /tmp/upgrade/deisctl uninstall platform
$ /tmp/upgrade/deisctl config platform set version=v1.13.2
$ /tmp/upgrade/deisctl config platform set version=v1.13.3
$ /opt/bin/deisctl refresh-units
$ /opt/bin/deisctl install platform
$ /opt/bin/deisctl start platform
Expand Down
Loading

0 comments on commit 9b21fcc

Please sign in to comment.