Skip to content

Commit 5574476

Browse files
mboersmamboersma
committed
chore(release): update version in master to v1.5.2
1 parent 93b8ce8 commit 5574476

11 files changed

Lines changed: 124 additions & 114 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
### v1.5.1 -> v1.5.2
2+
3+
#### Fixes
4+
5+
- [`a4bf040`](https://github.com/deis/deis/commit/a4bf040b5982dee6b92bfd4cfdfb3d57f30cdba2) router: include deis.conf if no match with an SSL cert
6+
- [`1df8eea`](https://github.com/deis/deis/commit/1df8eeaaf0f563d758167c454b2a8f9de612122f) controller: allow "*" wildcard in cert REST URLs
7+
- [`7f6099c`](https://github.com/deis/deis/commit/7f6099c865c7a48f88b435cfad01f435251208e2) controller: return the correct domain from get_object
8+
- [`02b78a2`](https://github.com/deis/deis/commit/02b78a258c93d1caa149be2dbf313a097552485f) router: write out only if cert matches the path
9+
- [`8e960ca`](https://github.com/deis/deis/commit/8e960ca203bd5d8c48e129c4172dd2b13cdc4439) (all): use "confd --interval 5" instead of "--watch"
10+
111
### v1.5.0 -> v1.5.1
212

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

5252
[Service]
5353
Type=oneshot
54-
ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.5.1'
54+
ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.5.2'
5555
- name: ntpdate.service
5656
command: start
5757
- name: timedate-ntp-synchronization.service
@@ -100,7 +100,7 @@ coreos:
100100
write_files:
101101
- path: /etc/deis-release
102102
content: |
103-
DEIS_RELEASE=v1.5.1
103+
DEIS_RELEASE=v1.5.2
104104
- path: /etc/motd
105105
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"
106106
- path: /etc/profile.d/nse-function.sh

‎docs/contributing/releases.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Patch Release
4646
docs/installing_deis/install-deisctl.rst \
4747
docs/installing_deis/install-platform.rst \
4848
docs/managing_deis/upgrading-deis.rst \
49-
docs/reference/api-v1.2.rst \
49+
docs/reference/api-v1.3.rst \
5050
docs/troubleshooting_deis/index.rst \
5151
logger/image/Dockerfile \
5252
logspout/image/Dockerfile \
@@ -96,7 +96,7 @@ Major or Minor Release
9696
docs/installing_deis/install-deisctl.rst \
9797
docs/installing_deis/install-platform.rst \
9898
docs/managing_deis/upgrading-deis.rst \
99-
docs/reference/api-v1.2.rst \
99+
docs/reference/api-v1.3.rst \
100100
docs/troubleshooting_deis/index.rst
101101
102102
- Edit deisctl/cmd/cmd.go and change the default in the RefreshUnits usage string

‎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.5.1
21+
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.5.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.5.1
23+
$ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.5.2
2424
25-
This installs ``deisctl`` version 1.5.1 to the current directory, and downloads the matching
25+
This installs ``deisctl`` version 1.5.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/opdemand/deisctl-1.5.1-linux-amd64.run
36+
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.5.2-linux-amd64.run
3737

3838
.. image:: download-osx-brightgreen.svg
39-
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.5.1-darwin-amd64.run
39+
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.5.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.5.1
17+
1.5.2
1818
1919
If not, follow instructions to :ref:`install_deisctl`.
2020

‎docs/managing_deis/upgrading-deis.rst‎

Lines changed: 3 additions & 3 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.5.1
44+
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.5.2
4545
$ deisctl --version # should match the desired platform
46-
1.5.1
47-
$ deisctl config platform set version=v1.5.1
46+
1.5.2
47+
$ deisctl config platform set version=v1.5.2
4848
$ deisctl install platform
4949
$ deisctl start platform
5050

‎docs/reference/api-v1.1.rst‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Example Response:
5555
5656
HTTP/1.1 201 CREATED
5757
X_DEIS_API_VERSION: 1.1
58-
X_DEIS_PLATFORM_VERSION: 1.5.0
58+
X_DEIS_PLATFORM_VERSION: 1.4.1
5959
Content-Type: application/json
6060
6161
{
@@ -93,7 +93,7 @@ Example Response:
9393
9494
HTTP/1.1 200 OK
9595
X_DEIS_API_VERSION: 1.1
96-
X_DEIS_PLATFORM_VERSION: 1.5.0
96+
X_DEIS_PLATFORM_VERSION: 1.4.1
9797
Content-Type: application/json
9898
9999
{"token": "abc123"}
@@ -116,7 +116,7 @@ Example Response:
116116
117117
HTTP/1.1 204 NO CONTENT
118118
X_DEIS_API_VERSION: 1.1
119-
X_DEIS_PLATFORM_VERSION: 1.5.0
119+
X_DEIS_PLATFORM_VERSION: 1.4.1
120120
121121
122122
Applications
@@ -140,7 +140,7 @@ Example Response:
140140
141141
HTTP/1.1 200 OK
142142
X_DEIS_API_VERSION: 1.1
143-
X_DEIS_PLATFORM_VERSION: 1.5.0
143+
X_DEIS_PLATFORM_VERSION: 1.4.1
144144
Content-Type: application/json
145145
146146
{
@@ -186,7 +186,7 @@ Example Response:
186186
187187
HTTP/1.1 201 CREATED
188188
X_DEIS_API_VERSION: 1.1
189-
X_DEIS_PLATFORM_VERSION: 1.5.0
189+
X_DEIS_PLATFORM_VERSION: 1.4.1
190190
Content-Type: application/json
191191
192192
{
@@ -217,7 +217,7 @@ Example Response:
217217
218218
HTTP/1.1 204 NO CONTENT
219219
X_DEIS_API_VERSION: 1.1
220-
X_DEIS_PLATFORM_VERSION: 1.5.0
220+
X_DEIS_PLATFORM_VERSION: 1.4.1
221221
222222
223223
List Application Details
@@ -237,7 +237,7 @@ Example Response:
237237
238238
HTTP/1.1 200 OK
239239
X_DEIS_API_VERSION: 1.1
240-
X_DEIS_PLATFORM_VERSION: 1.5.0
240+
X_DEIS_PLATFORM_VERSION: 1.4.1
241241
Content-Type: application/json
242242
243243
{
@@ -268,7 +268,7 @@ Example Response:
268268
269269
HTTP/1.1 200 OK
270270
X_DEIS_API_VERSION: 1.1
271-
X_DEIS_PLATFORM_VERSION: 1.5.0
271+
X_DEIS_PLATFORM_VERSION: 1.4.1
272272
Content-Type: text/plain
273273
274274
"16:51:14 deis[api]: test created initial release\n"
@@ -292,7 +292,7 @@ Example Response:
292292
293293
HTTP/1.1 200 OK
294294
X_DEIS_API_VERSION: 1.1
295-
X_DEIS_PLATFORM_VERSION: 1.5.0
295+
X_DEIS_PLATFORM_VERSION: 1.4.1
296296
Content-Type: application/json
297297
298298
{"rc": 0, "output": "hi"}
@@ -319,7 +319,7 @@ Example Response:
319319
320320
HTTP/1.1 200 OK
321321
X_DEIS_API_VERSION: 1.1
322-
X_DEIS_PLATFORM_VERSION: 1.5.0
322+
X_DEIS_PLATFORM_VERSION: 1.4.1
323323
Content-Type: application/json
324324
325325
{
@@ -359,7 +359,7 @@ Example Response:
359359
360360
HTTP/1.1 200 OK
361361
X_DEIS_API_VERSION: 1.1
362-
X_DEIS_PLATFORM_VERSION: 1.5.0
362+
X_DEIS_PLATFORM_VERSION: 1.4.1
363363
Content-Type: application/json
364364
365365
{
@@ -402,7 +402,7 @@ Example Response:
402402
403403
HTTP/1.1 204 NO CONTENT
404404
X_DEIS_API_VERSION: 1.1
405-
X_DEIS_PLATFORM_VERSION: 1.5.0
405+
X_DEIS_PLATFORM_VERSION: 1.4.1
406406
407407
408408
Configuration
@@ -426,7 +426,7 @@ Example Response:
426426
427427
HTTP/1.1 200 OK
428428
X_DEIS_API_VERSION: 1.1
429-
X_DEIS_PLATFORM_VERSION: 1.5.0
429+
X_DEIS_PLATFORM_VERSION: 1.4.1
430430
Content-Type: application/json
431431
432432
{
@@ -462,7 +462,7 @@ Example Response:
462462
463463
HTTP/1.1 201 CREATED
464464
X_DEIS_API_VERSION: 1.1
465-
X_DEIS_PLATFORM_VERSION: 1.5.0
465+
X_DEIS_PLATFORM_VERSION: 1.4.1
466466
Content-Type: application/json
467467
X-Deis-Release: 3
468468
@@ -505,7 +505,7 @@ Example Response:
505505
506506
HTTP/1.1 201 CREATED
507507
X_DEIS_API_VERSION: 1.1
508-
X_DEIS_PLATFORM_VERSION: 1.5.0
508+
X_DEIS_PLATFORM_VERSION: 1.4.1
509509
Content-Type: application/json
510510
X-Deis-Release: 4
511511
@@ -547,7 +547,7 @@ Example Response:
547547
548548
HTTP/1.1 200 OK
549549
X_DEIS_API_VERSION: 1.1
550-
X_DEIS_PLATFORM_VERSION: 1.5.0
550+
X_DEIS_PLATFORM_VERSION: 1.4.1
551551
Content-Type: application/json
552552
553553
{
@@ -585,7 +585,7 @@ Example Response:
585585
586586
HTTP/1.1 201 CREATED
587587
X_DEIS_API_VERSION: 1.1
588-
X_DEIS_PLATFORM_VERSION: 1.5.0
588+
X_DEIS_PLATFORM_VERSION: 1.4.1
589589
Content-Type: application/json
590590
591591
{
@@ -615,7 +615,7 @@ Example Response:
615615
616616
HTTP/1.1 204 NO CONTENT
617617
X_DEIS_API_VERSION: 1.1
618-
X_DEIS_PLATFORM_VERSION: 1.5.0
618+
X_DEIS_PLATFORM_VERSION: 1.4.1
619619
620620
621621
Builds
@@ -639,7 +639,7 @@ Example Response:
639639
640640
HTTP/1.1 200 OK
641641
X_DEIS_API_VERSION: 1.1
642-
X_DEIS_PLATFORM_VERSION: 1.5.0
642+
X_DEIS_PLATFORM_VERSION: 1.4.1
643643
Content-Type: application/json
644644
645645
{
@@ -684,7 +684,7 @@ Example Response:
684684
685685
HTTP/1.1 201 CREATED
686686
X_DEIS_API_VERSION: 1.1
687-
X_DEIS_PLATFORM_VERSION: 1.5.0
687+
X_DEIS_PLATFORM_VERSION: 1.4.1
688688
Content-Type: application/json
689689
X-Deis-Release: 4
690690
@@ -722,7 +722,7 @@ Example Response:
722722
723723
HTTP/1.1 200 OK
724724
X_DEIS_API_VERSION: 1.1
725-
X_DEIS_PLATFORM_VERSION: 1.5.0
725+
X_DEIS_PLATFORM_VERSION: 1.4.1
726726
Content-Type: application/json
727727
728728
{
@@ -784,7 +784,7 @@ Example Response:
784784
785785
HTTP/1.1 200 OK
786786
X_DEIS_API_VERSION: 1.1
787-
X_DEIS_PLATFORM_VERSION: 1.5.0
787+
X_DEIS_PLATFORM_VERSION: 1.4.1
788788
Content-Type: application/json
789789
790790
{
@@ -820,7 +820,7 @@ Example Response:
820820
821821
HTTP/1.1 201 CREATED
822822
X_DEIS_API_VERSION: 1.1
823-
X_DEIS_PLATFORM_VERSION: 1.5.0
823+
X_DEIS_PLATFORM_VERSION: 1.4.1
824824
Content-Type: application/json
825825
826826
{"version": 5}
@@ -847,7 +847,7 @@ Example Response:
847847
848848
{
849849
X_DEIS_API_VERSION: 1.1
850-
X_DEIS_PLATFORM_VERSION: 1.5.0
850+
X_DEIS_PLATFORM_VERSION: 1.4.1
851851
"count": 1,
852852
"next": null,
853853
"previous": null,
@@ -886,7 +886,7 @@ Example Response:
886886
887887
HTTP/1.1 201 CREATED
888888
X_DEIS_API_VERSION: 1.1
889-
X_DEIS_PLATFORM_VERSION: 1.5.0
889+
X_DEIS_PLATFORM_VERSION: 1.4.1
890890
Content-Type: application/json
891891
892892
{
@@ -916,7 +916,7 @@ Example Response:
916916
917917
HTTP/1.1 204 NO CONTENT
918918
X_DEIS_API_VERSION: 1.1
919-
X_DEIS_PLATFORM_VERSION: 1.5.0
919+
X_DEIS_PLATFORM_VERSION: 1.4.1
920920
921921
922922
Permissions
@@ -940,7 +940,7 @@ Example Response:
940940
941941
HTTP/1.1 200 OK
942942
X_DEIS_API_VERSION: 1.1
943-
X_DEIS_PLATFORM_VERSION: 1.5.0
943+
X_DEIS_PLATFORM_VERSION: 1.4.1
944944
Content-Type: application/json
945945
946946
{
@@ -967,7 +967,7 @@ Example Response:
967967
968968
HTTP/1.1 201 CREATED
969969
X_DEIS_API_VERSION: 1.1
970-
X_DEIS_PLATFORM_VERSION: 1.5.0
970+
X_DEIS_PLATFORM_VERSION: 1.4.1
971971
972972
973973
Remove Application Permission
@@ -987,7 +987,7 @@ Example Response:
987987
988988
HTTP/1.1 204 NO CONTENT
989989
X_DEIS_API_VERSION: 1.1
990-
X_DEIS_PLATFORM_VERSION: 1.5.0
990+
X_DEIS_PLATFORM_VERSION: 1.4.1
991991
992992
Grant User Administrative Privileges
993993
````````````````````````````````````
@@ -1012,4 +1012,4 @@ Example Response:
10121012
10131013
HTTP/1.1 201 CREATED
10141014
X_DEIS_API_VERSION: 1.1
1015-
X_DEIS_PLATFORM_VERSION: 1.5.0
1015+
X_DEIS_PLATFORM_VERSION: 1.4.1

0 commit comments

Comments
 (0)