Skip to content

Commit dbd42a7

Browse files
mboersmamboersma
committed
chore(release): update version in master to v1.2.1
1 parent 50a14ed commit dbd42a7

8 files changed

Lines changed: 49 additions & 42 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
### v1.2.0 -> v1.2.1
2+
3+
#### Maintenance
4+
5+
- [`3292b7c`](https://github.com/deis/deis/commit/3292b7c693b84f5789bbb12bee33ad61f2ec400d) release: update version to v1.2.1
6+
- [`0d13d66`](https://github.com/deis/deis/commit/0d13d66ee40b6d41d6328b411b98521283a1300b) controller: update Django to 1.6.10 security release
7+
18
### v1.1.1 -> v1.2.0
29

310
#### Features

‎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.2.0-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.2.0)
6+
[![Current Release](http://img.shields.io/badge/release-v1.2.1-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.2.1)
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
@@ -40,7 +40,7 @@ coreos:
4040

4141
[Service]
4242
Type=oneshot
43-
ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.2.0'
43+
ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.2.1'
4444
- name: ntpdate.service
4545
command: start
4646
- name: timedate-ntp-synchronization.service
@@ -68,7 +68,7 @@ coreos:
6868
write_files:
6969
- path: /etc/deis-release
7070
content: |
71-
DEIS_RELEASE=v1.2.0
71+
DEIS_RELEASE=v1.2.1
7272
- path: /etc/motd
7373
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"
7474
- path: /etc/profile.d/nse-function.sh

‎docs/installing_deis/install-deisctl.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ 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.2.0
21+
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.2.1
2222
23-
This installs ``deisctl`` version 1.2.0 to the current directory, and downloads the matching
23+
This installs ``deisctl`` version 1.2.1 to the current directory, and downloads the matching
2424
Deis systemd unit files used to schedule the components. Link ``deisctl`` into /usr/local/bin, so
2525
it will be in your ``$PATH``:
2626

@@ -31,10 +31,10 @@ it will be in your ``$PATH``:
3131
To change installation options, save the installer directly:
3232

3333
.. image:: download-linux-brightgreen.svg
34-
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.2.0-linux-amd64.run
34+
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.2.1-linux-amd64.run
3535

3636
.. image:: download-osx-brightgreen.svg
37-
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.2.0-darwin-amd64.run
37+
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.2.1-darwin-amd64.run
3838

3939
Then run the downloaded file as a shell script. Append ``--help`` to see what options
4040
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.2.0
17+
1.2.1
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
@@ -56,10 +56,10 @@ Finally, update ``deisctl`` to the new version and reinstall:
5656

5757
.. code-block:: console
5858
59-
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.2.0
59+
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.2.1
6060
$ deisctl --version # should match the desired platform
61-
1.2.0
62-
$ deisctl config platform set version=v1.2.0
61+
1.2.1
62+
$ deisctl config platform set version=v1.2.1
6363
$ deisctl install platform
6464
$ deisctl start platform
6565

‎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.2.0
58+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
96+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
119+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
143+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
189+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
220+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
240+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
271+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
295+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
322+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
362+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
405+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
429+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
465+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
508+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
550+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
588+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
618+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
642+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
687+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
725+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
787+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
823+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
850+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
889+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
919+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
943+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
970+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
990+
X_DEIS_PLATFORM_VERSION: 1.2.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.2.0
1015+
X_DEIS_PLATFORM_VERSION: 1.2.1

‎docs/troubleshooting_deis/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ If you built ``deisctl`` locally or didn't use its installer, you may see an err
170170
171171
This is because ``deisctl`` could not find unit files for Deis locally. Run
172172
``deisctl help refresh-units`` to see where ``deisctl`` searches, and then run a command such as
173-
``deisctl refresh-units --tag=v1.2.0``, or set the ``$DEISCTL_UNITS`` environment variable to a directory
173+
``deisctl refresh-units --tag=v1.2.1``, or set the ``$DEISCTL_UNITS`` environment variable to a directory
174174
containing the unit files.
175175

176176
Other issues

0 commit comments

Comments
 (0)