Skip to content

Commit 1cfaef3

Browse files
committed
chore(release): update version in master to v1.12.2
1 parent a19caaf commit 1cfaef3

9 files changed

Lines changed: 80 additions & 60 deletions

File tree

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
### v1.12.1 -> v1.12.2
2+
3+
#### Fixes
4+
5+
- [`0738c13`](https://github.com/deis/deis/commit/0738c13949187a6d444a693193585aed7e44304a) database: supports HTTPs as S3 endpoint
6+
- [`3498099`](https://github.com/deis/deis/commit/34980992c27497735b9155ce7ff8786c048e1f41) router: fix router common prefix app publishing
7+
- [`27eab71`](https://github.com/deis/deis/commit/27eab713f9dd1c2a4f3bc5b8152b43df7bec66b5) contrib: Add drop-in to make docker require flannel
8+
- [`42d00af`](https://github.com/deis/deis/commit/42d00af18390745da4bebf6b3f70c11d40e09884) deisctl: don't panic when config key/value is malformed
9+
- [`7410fb7`](https://github.com/deis/deis/commit/7410fb74c7fe5c85a9df1765d5b18ea836e68f8d) builder: Fix problem with missed git repos after builder restart
10+
11+
#### Documentation
12+
13+
- [`a19caaf`](https://github.com/deis/deis/commit/a19caaf61ad7e3f718570b93f9fe11aa0665fa2f) managing_deis: change swift3 link.
14+
- [`82732b4`](https://github.com/deis/deis/commit/82732b486f4531242b41b44493c7f69da3aa2425) hacking: add docs to show how to use the docker-machine env
15+
16+
#### Maintenance
17+
18+
- [`0f96abe`](https://github.com/deis/deis/commit/0f96abea0a7d28257f8c87e89eb6453fec21fa79) contrib/coreos: remove debug-etcd service
19+
- [`e1e3927`](https://github.com/deis/deis/commit/e1e39274cbed8e5fc04dfa5b6a42dc74ae1b61f7) MAINTAINERS: don't enumerate maintainers
20+
121
### v1.12.0 -> v1.12.1
222

323
#### Fixes

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
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.
44

55
[![Build Status](https://ci.deis.io/buildStatus/icon?job=test-acceptance)](https://ci.deis.io/job/test-acceptance/)
6-
[![Current Release](http://img.shields.io/badge/release-v1.12.1-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.12.1)
6+
[![Current Release](http://img.shields.io/badge/release-v1.12.2-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.12.2)
77
[![Latest Docs](http://img.shields.io/badge/docs-latest-fc1e5e.svg)](http://docs.deis.io/en/latest/)
88

99
![Deis Graphic](https://s3-us-west-2.amazonaws.com/deis-images/deis-graphic.png)

contrib/coreos/user-data.example

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ coreos:
8484

8585
[Service]
8686
Type=oneshot
87-
ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.12.1'
87+
ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.12.2'
8888
- name: increase-nf_conntrack-connections.service
8989
command: start
9090
content: |
@@ -98,7 +98,7 @@ coreos:
9898
write_files:
9999
- path: /etc/deis-release
100100
content: |
101-
DEIS_RELEASE=v1.12.1
101+
DEIS_RELEASE=v1.12.2
102102
- path: /etc/motd
103103
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"
104104
- path: /etc/profile.d/nse-function.sh

docs/_includes/_get-the-source.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ this documentation. Download an archive file from the `releases page`_, or use
66
77
$ git clone https://github.com/deis/deis.git
88
$ cd deis
9-
$ git checkout v1.12.1
9+
$ git checkout v1.12.2
1010
1111
Check out the latest Deis release, rather than using the default (master).
1212

docs/installing_deis/install-deisctl.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ and run the latest installer:
1818
.. code-block:: console
1919
2020
$ cd ~/bin
21-
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.12.1
21+
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.12.2
2222
$ # on CoreOS, add "sudo" to install to /opt/bin/deisctl
23-
$ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.12.1
23+
$ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.12.2
2424
25-
This installs ``deisctl`` version 1.12.1 to the current directory, and downloads the matching
25+
This installs ``deisctl`` version 1.12.2 to the current directory, and downloads the matching
2626
Deis systemd unit files used to schedule the components. Link ``deisctl`` into /usr/local/bin, so
2727
it will be in your ``$PATH``:
2828

@@ -33,10 +33,10 @@ it will be in your ``$PATH``:
3333
To change installation options, save the installer directly:
3434

3535
.. image:: download-linux-brightgreen.svg
36-
:target: https://s3-us-west-2.amazonaws.com/get-deis/deisctl-1.12.1-linux-amd64.run
36+
:target: https://s3-us-west-2.amazonaws.com/get-deis/deisctl-1.12.2-linux-amd64.run
3737

3838
.. image:: download-osx-brightgreen.svg
39-
:target: https://s3-us-west-2.amazonaws.com/get-deis/deisctl-1.12.1-darwin-amd64.run
39+
:target: https://s3-us-west-2.amazonaws.com/get-deis/deisctl-1.12.2-darwin-amd64.run
4040

4141
Then run the downloaded file as a shell script. Append ``--help`` to see what options
4242
are available.

docs/installing_deis/install-platform.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ First check that you have ``deisctl`` installed and the version is correct.
1414
.. code-block:: console
1515
1616
$ deisctl --version
17-
1.12.1
17+
1.12.2
1818
1919
If not, follow instructions to :ref:`install_deisctl`.
2020

docs/managing_deis/upgrading-deis.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ Finally, update ``deisctl`` to the new version and reinstall:
4141

4242
.. code-block:: console
4343
44-
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.12.1
44+
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.12.2
4545
$ deisctl --version # should match the desired platform
46-
1.12.1
47-
$ deisctl config platform set version=v1.12.1
46+
1.12.2
47+
$ deisctl config platform set version=v1.12.2
4848
$ deisctl install platform
4949
$ deisctl start platform
5050
@@ -99,11 +99,11 @@ to. Care should be taken not to overwrite the existing ``deisctl`` version.
9999
.. code-block:: console
100100
101101
$ mkdir /tmp/upgrade
102-
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.12.1 /tmp/upgrade
102+
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.12.2 /tmp/upgrade
103103
$ /tmp/upgrade/deisctl --version # should match the desired platform
104-
1.12.1
104+
1.12.2
105105
$ /tmp/upgrade/deisctl refresh-units
106-
$ /tmp/upgrade/deisctl config platform set version=v1.12.1
106+
$ /tmp/upgrade/deisctl config platform set version=v1.12.2
107107
108108
Now it is possible to prepare the cluster for the upgrade using the old ``deisctl`` binary. This command will shutdown
109109
and uninstall all components of the cluster except the router and publisher. This means your services should still be
@@ -128,7 +128,7 @@ If the process were to fail, the old version can be restored manually by reinsta
128128
129129
$ /tmp/upgrade/deisctl stop platform
130130
$ /tmp/upgrade/deisctl uninstall platform
131-
$ /tmp/upgrade/deisctl config platform set version=v1.12.1
131+
$ /tmp/upgrade/deisctl config platform set version=v1.12.2
132132
$ /opt/bin/deisctl refresh-units
133133
$ /opt/bin/deisctl install platform
134134
$ /opt/bin/deisctl start platform

0 commit comments

Comments
 (0)