Skip to content

Commit 65b39eb

Browse files
mboersmamboersma
committed
chore(release): update release version in master to v1.1.1
1 parent b4fd8e3 commit 65b39eb

10 files changed

Lines changed: 59 additions & 45 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
### v1.1.0 -> v1.1.1
2+
3+
#### Fixes
4+
5+
- [`fe56989`](https://github.com/deis/deis/commit/fe56989b2a2df5143a81137bffc751b3728e389c) deisctl: remove unimplemented --verbose flag from "deisctl config"
6+
- [`430edbe`](https://github.com/deis/deis/commit/430edbeebea436c2d1ef726a479b92fa9020cf78) deisctl: parse global and command-specific options correctly
7+
- [`962a181`](https://github.com/deis/deis/commit/962a1814c6aed02ce8c1166126e244918efb10ad) builder: the value could be a number
8+
9+
#### Maintenance
10+
11+
- [`c9c181e`](https://github.com/deis/deis/commit/c9c181e9b5a1cd58a5fbab70446ea43fd432a0a1) release: update version to v1.1.1
12+
- [`6fcb278`](https://github.com/deis/deis/commit/6fcb2789a93361c59ebb446d69941e7ec43cd954) (all): update base CoreOS to 494.5.0
13+
- [`3075405`](https://github.com/deis/deis/commit/3075405d66d347c4e132f5ac48897a43b7ef78eb) builder: update Docker to 1.3.3
14+
115
### v1.0.2 -> v1.1.0
216

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

‎client/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929

3030
setup(name='deis',
31-
version='1.1.0',
31+
version='1.1.1',
3232
license=APACHE_LICENSE,
3333
description='Command-line Client for Deis, the open PaaS',
3434
author='OpDemand',

‎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.1.0'
43+
ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.1.1'
4444
- name: ntpdate.service
4545
command: start
4646
- name: timedate-ntp-synchronization.service
@@ -59,7 +59,7 @@ coreos:
5959
write_files:
6060
- path: /etc/deis-release
6161
content: |
62-
DEIS_RELEASE=v1.1.0
62+
DEIS_RELEASE=v1.1.1
6363
- path: /etc/motd
6464
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"
6565
- path: /etc/profile.d/nse-function.sh

‎controller/api/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
The **api** Django app presents a RESTful web API for interacting with the **deis** system.
33
"""
44

5-
__version__ = '1.1.0'
5+
__version__ = '1.1.1'

‎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.1.0
21+
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.1.1
2222
23-
This installs ``deisctl`` version 1.1.0 to the current directory, and downloads the matching
23+
This installs ``deisctl`` version 1.1.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.1.0-linux-amd64.run
34+
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.1.1-linux-amd64.run
3535

3636
.. image:: download-osx-brightgreen.svg
37-
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.1.0-darwin-amd64.run
37+
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.1.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.1.0
17+
1.1.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.1.0
59+
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.1.1
6060
$ deisctl --version # should match the desired platform
61-
1.1.0
62-
$ deisctl config platform set version=v1.1.0
61+
1.1.1
62+
$ deisctl config platform set version=v1.1.1
6363
$ deisctl install platform
6464
$ deisctl start platform
6565

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

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Example Response:
5353
5454
HTTP/1.1 201 CREATED
5555
X_DEIS_API_VERSION: 1.1
56-
X_DEIS_PLATFORM_VERSION: 1.1.0
56+
X_DEIS_PLATFORM_VERSION: 1.1.1
5757
Content-Type: application/json
5858
5959
{
@@ -91,7 +91,7 @@ Example Response:
9191
9292
HTTP/1.1 200 OK
9393
X_DEIS_API_VERSION: 1.1
94-
X_DEIS_PLATFORM_VERSION: 1.1.0
94+
X_DEIS_PLATFORM_VERSION: 1.1.1
9595
Content-Type: application/json
9696
9797
{"token": "abc123"}
@@ -114,7 +114,7 @@ Example Response:
114114
115115
HTTP/1.1 204 NO CONTENT
116116
X_DEIS_API_VERSION: 1.1
117-
X_DEIS_PLATFORM_VERSION: 1.1.0
117+
X_DEIS_PLATFORM_VERSION: 1.1.1
118118
119119
120120
Applications
@@ -138,7 +138,7 @@ Example Response:
138138
139139
HTTP/1.1 200 OK
140140
X_DEIS_API_VERSION: 1.1
141-
X_DEIS_PLATFORM_VERSION: 1.1.0
141+
X_DEIS_PLATFORM_VERSION: 1.1.1
142142
Content-Type: application/json
143143
144144
{
@@ -184,7 +184,7 @@ Example Response:
184184
185185
HTTP/1.1 201 CREATED
186186
X_DEIS_API_VERSION: 1.1
187-
X_DEIS_PLATFORM_VERSION: 1.1.0
187+
X_DEIS_PLATFORM_VERSION: 1.1.1
188188
Content-Type: application/json
189189
190190
{
@@ -215,7 +215,7 @@ Example Response:
215215
216216
HTTP/1.1 204 NO CONTENT
217217
X_DEIS_API_VERSION: 1.1
218-
X_DEIS_PLATFORM_VERSION: 1.1.0
218+
X_DEIS_PLATFORM_VERSION: 1.1.1
219219
220220
221221
List Application Details
@@ -235,7 +235,7 @@ Example Response:
235235
236236
HTTP/1.1 200 OK
237237
X_DEIS_API_VERSION: 1.1
238-
X_DEIS_PLATFORM_VERSION: 1.1.0
238+
X_DEIS_PLATFORM_VERSION: 1.1.1
239239
Content-Type: application/json
240240
241241
{
@@ -266,7 +266,7 @@ Example Response:
266266
267267
HTTP/1.1 200 OK
268268
X_DEIS_API_VERSION: 1.1
269-
X_DEIS_PLATFORM_VERSION: 1.1.0
269+
X_DEIS_PLATFORM_VERSION: 1.1.1
270270
Content-Type: text/plain
271271
272272
"16:51:14 deis[api]: test created initial release\n"
@@ -290,7 +290,7 @@ Example Response:
290290
291291
HTTP/1.1 200 OK
292292
X_DEIS_API_VERSION: 1.1
293-
X_DEIS_PLATFORM_VERSION: 1.1.0
293+
X_DEIS_PLATFORM_VERSION: 1.1.1
294294
Content-Type: application/json
295295
296296
{"rc": 0, "output": "hi"}
@@ -317,7 +317,7 @@ Example Response:
317317
318318
HTTP/1.1 200 OK
319319
X_DEIS_API_VERSION: 1.1
320-
X_DEIS_PLATFORM_VERSION: 1.1.0
320+
X_DEIS_PLATFORM_VERSION: 1.1.1
321321
Content-Type: application/json
322322
323323
{
@@ -357,7 +357,7 @@ Example Response:
357357
358358
HTTP/1.1 200 OK
359359
X_DEIS_API_VERSION: 1.1
360-
X_DEIS_PLATFORM_VERSION: 1.1.0
360+
X_DEIS_PLATFORM_VERSION: 1.1.1
361361
Content-Type: application/json
362362
363363
{
@@ -400,7 +400,7 @@ Example Response:
400400
401401
HTTP/1.1 204 NO CONTENT
402402
X_DEIS_API_VERSION: 1.1
403-
X_DEIS_PLATFORM_VERSION: 1.1.0
403+
X_DEIS_PLATFORM_VERSION: 1.1.1
404404
405405
406406
Configuration
@@ -424,7 +424,7 @@ Example Response:
424424
425425
HTTP/1.1 200 OK
426426
X_DEIS_API_VERSION: 1.1
427-
X_DEIS_PLATFORM_VERSION: 1.1.0
427+
X_DEIS_PLATFORM_VERSION: 1.1.1
428428
Content-Type: application/json
429429
430430
{
@@ -460,7 +460,7 @@ Example Response:
460460
461461
HTTP/1.1 201 CREATED
462462
X_DEIS_API_VERSION: 1.1
463-
X_DEIS_PLATFORM_VERSION: 1.1.0
463+
X_DEIS_PLATFORM_VERSION: 1.1.1
464464
Content-Type: application/json
465465
X-Deis-Release: 3
466466
@@ -503,7 +503,7 @@ Example Response:
503503
504504
HTTP/1.1 201 CREATED
505505
X_DEIS_API_VERSION: 1.1
506-
X_DEIS_PLATFORM_VERSION: 1.1.0
506+
X_DEIS_PLATFORM_VERSION: 1.1.1
507507
Content-Type: application/json
508508
X-Deis-Release: 4
509509
@@ -512,7 +512,7 @@ Example Response:
512512
"app": "example-go",
513513
"values": {
514514
"DEIS_APP": "example-go",
515-
"DEIS_RELEASE": "v4",
515+
"DEIS_RELEASE": "v4",
516516
"PLATFORM": "deis"
517517
},
518518
"memory": {},
@@ -545,7 +545,7 @@ Example Response:
545545
546546
HTTP/1.1 200 OK
547547
X_DEIS_API_VERSION: 1.1
548-
X_DEIS_PLATFORM_VERSION: 1.1.0
548+
X_DEIS_PLATFORM_VERSION: 1.1.1
549549
Content-Type: application/json
550550
551551
{
@@ -583,7 +583,7 @@ Example Response:
583583
584584
HTTP/1.1 201 CREATED
585585
X_DEIS_API_VERSION: 1.1
586-
X_DEIS_PLATFORM_VERSION: 1.1.0
586+
X_DEIS_PLATFORM_VERSION: 1.1.1
587587
Content-Type: application/json
588588
589589
{
@@ -613,7 +613,7 @@ Example Response:
613613
614614
HTTP/1.1 204 NO CONTENT
615615
X_DEIS_API_VERSION: 1.1
616-
X_DEIS_PLATFORM_VERSION: 1.1.0
616+
X_DEIS_PLATFORM_VERSION: 1.1.1
617617
618618
619619
Builds
@@ -637,7 +637,7 @@ Example Response:
637637
638638
HTTP/1.1 200 OK
639639
X_DEIS_API_VERSION: 1.1
640-
X_DEIS_PLATFORM_VERSION: 1.1.0
640+
X_DEIS_PLATFORM_VERSION: 1.1.1
641641
Content-Type: application/json
642642
643643
{
@@ -682,7 +682,7 @@ Example Response:
682682
683683
HTTP/1.1 201 CREATED
684684
X_DEIS_API_VERSION: 1.1
685-
X_DEIS_PLATFORM_VERSION: 1.1.0
685+
X_DEIS_PLATFORM_VERSION: 1.1.1
686686
Content-Type: application/json
687687
X-Deis-Release: 4
688688
@@ -720,7 +720,7 @@ Example Response:
720720
721721
HTTP/1.1 200 OK
722722
X_DEIS_API_VERSION: 1.1
723-
X_DEIS_PLATFORM_VERSION: 1.1.0
723+
X_DEIS_PLATFORM_VERSION: 1.1.1
724724
Content-Type: application/json
725725
726726
{
@@ -782,7 +782,7 @@ Example Response:
782782
783783
HTTP/1.1 200 OK
784784
X_DEIS_API_VERSION: 1.1
785-
X_DEIS_PLATFORM_VERSION: 1.1.0
785+
X_DEIS_PLATFORM_VERSION: 1.1.1
786786
Content-Type: application/json
787787
788788
{
@@ -818,7 +818,7 @@ Example Response:
818818
819819
HTTP/1.1 201 CREATED
820820
X_DEIS_API_VERSION: 1.1
821-
X_DEIS_PLATFORM_VERSION: 1.1.0
821+
X_DEIS_PLATFORM_VERSION: 1.1.1
822822
Content-Type: application/json
823823
824824
{"version": 5}
@@ -845,7 +845,7 @@ Example Response:
845845
846846
{
847847
X_DEIS_API_VERSION: 1.1
848-
X_DEIS_PLATFORM_VERSION: 1.1.0
848+
X_DEIS_PLATFORM_VERSION: 1.1.1
849849
"count": 1,
850850
"next": null,
851851
"previous": null,
@@ -884,7 +884,7 @@ Example Response:
884884
885885
HTTP/1.1 201 CREATED
886886
X_DEIS_API_VERSION: 1.1
887-
X_DEIS_PLATFORM_VERSION: 1.1.0
887+
X_DEIS_PLATFORM_VERSION: 1.1.1
888888
Content-Type: application/json
889889
890890
{
@@ -914,7 +914,7 @@ Example Response:
914914
915915
HTTP/1.1 204 NO CONTENT
916916
X_DEIS_API_VERSION: 1.1
917-
X_DEIS_PLATFORM_VERSION: 1.1.0
917+
X_DEIS_PLATFORM_VERSION: 1.1.1
918918
919919
920920
Permissions
@@ -938,7 +938,7 @@ Example Response:
938938
939939
HTTP/1.1 200 OK
940940
X_DEIS_API_VERSION: 1.1
941-
X_DEIS_PLATFORM_VERSION: 1.1.0
941+
X_DEIS_PLATFORM_VERSION: 1.1.1
942942
Content-Type: application/json
943943
944944
{
@@ -965,7 +965,7 @@ Example Response:
965965
966966
HTTP/1.1 201 CREATED
967967
X_DEIS_API_VERSION: 1.1
968-
X_DEIS_PLATFORM_VERSION: 1.1.0
968+
X_DEIS_PLATFORM_VERSION: 1.1.1
969969
970970
971971
Remove Application Permission
@@ -985,7 +985,7 @@ Example Response:
985985
986986
HTTP/1.1 204 NO CONTENT
987987
X_DEIS_API_VERSION: 1.1
988-
X_DEIS_PLATFORM_VERSION: 1.1.0
988+
X_DEIS_PLATFORM_VERSION: 1.1.1
989989
990990
Grant User Administrative Privileges
991991
````````````````````````````````````
@@ -1010,4 +1010,4 @@ Example Response:
10101010
10111011
HTTP/1.1 201 CREATED
10121012
X_DEIS_API_VERSION: 1.1
1013-
X_DEIS_PLATFORM_VERSION: 1.1.0
1013+
X_DEIS_PLATFORM_VERSION: 1.1.1

‎docs/troubleshooting_deis/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ If you built ``deisctl`` locally or didn't use its installer, you may see an err
158158
159159
This is because ``deisctl`` could not find unit files for Deis locally. Run
160160
``deisctl help refresh-units`` to see where ``deisctl`` searches, and then run a command such as
161-
``deisctl refresh-units --tag=v1.1.0``, or set the ``$DEISCTL_UNITS`` environment variable to a directory
161+
``deisctl refresh-units --tag=v1.1.1``, or set the ``$DEISCTL_UNITS`` environment variable to a directory
162162
containing the unit files.
163163

164164
Other issues

0 commit comments

Comments
 (0)