Skip to content

Commit

Permalink
chore(release): update version in master to v1.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew Fisher committed Mar 6, 2015
1 parent 273aca9 commit e372bc3
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 42 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
### v1.4.0 -> v1.4.1

#### Fixes

- [`cf61859`](https://github.com/deis/deis/commit/cf61859be532603b615c511ab9b2f6163e0d8ce6) builder: strip single quotes from BUILDPACK_URL"
- [`45e7413`](https://github.com/deis/deis/commit/45e74138b6b88c14fbc844bbc8eb1979237601ab) builder: properly escape backticks"
- [`0046494`](https://github.com/deis/deis/commit/004649486f26c4d3c43fd4f56a27a4e873b6f59d) builder: properly escape backticks in envvars"

#### Maintenance

- [`6960646`](https://github.com/deis/deis/commit/696064661a70846ccc1780299a714aeff8c4999e) release: update version to v1.4.1

### v1.3.1 -> v1.4.0

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

![Deis Graphic](https://s3-us-west-2.amazonaws.com/deis-images/deis-graphic.png)
Expand Down
4 changes: 2 additions & 2 deletions contrib/coreos/user-data.example
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,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.4.0'
ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.4.1'
- name: ntpdate.service
command: start
- name: timedate-ntp-synchronization.service
Expand Down Expand Up @@ -79,7 +79,7 @@ coreos:
write_files:
- path: /etc/deis-release
content: |
DEIS_RELEASE=v1.4.0
DEIS_RELEASE=v1.4.1
- 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
8 changes: 4 additions & 4 deletions docs/installing_deis/install-deisctl.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ and run the latest installer:
.. code-block:: console
$ cd ~/bin
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.4.0
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.4.1
This installs ``deisctl`` version 1.4.0 to the current directory, and downloads the matching
This installs ``deisctl`` version 1.4.1 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 @@ -31,10 +31,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/opdemand/deisctl-1.4.0-linux-amd64.run
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.4.1-linux-amd64.run

.. image:: download-osx-brightgreen.svg
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.4.0-darwin-amd64.run
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.4.1-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
View file
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.4.0
1.4.1
If not, follow instructions to :ref:`install_deisctl`.

Expand Down
6 changes: 3 additions & 3 deletions docs/managing_deis/upgrading-deis.rst
View file
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.4.0
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.4.1
$ deisctl --version # should match the desired platform
1.4.0
$ deisctl config platform set version=v1.4.0
1.4.1
$ deisctl config platform set version=v1.4.1
$ deisctl install platform
$ deisctl start platform
Expand Down
60 changes: 30 additions & 30 deletions docs/reference/api-v1.1.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Example Response:
HTTP/1.1 201 CREATED
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
{
Expand Down Expand Up @@ -95,7 +95,7 @@ Example Response:
HTTP/1.1 200 OK
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
{"token": "abc123"}
Expand All @@ -118,7 +118,7 @@ Example Response:
HTTP/1.1 204 NO CONTENT
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Applications
Expand All @@ -142,7 +142,7 @@ Example Response:
HTTP/1.1 200 OK
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
{
Expand Down Expand Up @@ -188,7 +188,7 @@ Example Response:
HTTP/1.1 201 CREATED
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
{
Expand Down Expand Up @@ -219,7 +219,7 @@ Example Response:
HTTP/1.1 204 NO CONTENT
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
List Application Details
Expand All @@ -239,7 +239,7 @@ Example Response:
HTTP/1.1 200 OK
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
{
Expand Down Expand Up @@ -270,7 +270,7 @@ Example Response:
HTTP/1.1 200 OK
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: text/plain
"16:51:14 deis[api]: test created initial release\n"
Expand All @@ -294,7 +294,7 @@ Example Response:
HTTP/1.1 200 OK
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
{"rc": 0, "output": "hi"}
Expand All @@ -321,7 +321,7 @@ Example Response:
HTTP/1.1 200 OK
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
{
Expand Down Expand Up @@ -361,7 +361,7 @@ Example Response:
HTTP/1.1 200 OK
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
{
Expand Down Expand Up @@ -404,7 +404,7 @@ Example Response:
HTTP/1.1 204 NO CONTENT
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Configuration
Expand All @@ -428,7 +428,7 @@ Example Response:
HTTP/1.1 200 OK
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
{
Expand Down Expand Up @@ -464,7 +464,7 @@ Example Response:
HTTP/1.1 201 CREATED
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
X-Deis-Release: 3
Expand Down Expand Up @@ -507,7 +507,7 @@ Example Response:
HTTP/1.1 201 CREATED
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
X-Deis-Release: 4
Expand Down Expand Up @@ -549,7 +549,7 @@ Example Response:
HTTP/1.1 200 OK
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
{
Expand Down Expand Up @@ -587,7 +587,7 @@ Example Response:
HTTP/1.1 201 CREATED
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
{
Expand Down Expand Up @@ -617,7 +617,7 @@ Example Response:
HTTP/1.1 204 NO CONTENT
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Builds
Expand All @@ -641,7 +641,7 @@ Example Response:
HTTP/1.1 200 OK
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
{
Expand Down Expand Up @@ -686,7 +686,7 @@ Example Response:
HTTP/1.1 201 CREATED
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
X-Deis-Release: 4
Expand Down Expand Up @@ -724,7 +724,7 @@ Example Response:
HTTP/1.1 200 OK
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
{
Expand Down Expand Up @@ -786,7 +786,7 @@ Example Response:
HTTP/1.1 200 OK
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
{
Expand Down Expand Up @@ -822,7 +822,7 @@ Example Response:
HTTP/1.1 201 CREATED
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
{"version": 5}
Expand All @@ -849,7 +849,7 @@ Example Response:
{
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
"count": 1,
"next": null,
"previous": null,
Expand Down Expand Up @@ -888,7 +888,7 @@ Example Response:
HTTP/1.1 201 CREATED
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
{
Expand Down Expand Up @@ -918,7 +918,7 @@ Example Response:
HTTP/1.1 204 NO CONTENT
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Permissions
Expand All @@ -942,7 +942,7 @@ Example Response:
HTTP/1.1 200 OK
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Content-Type: application/json
{
Expand All @@ -969,7 +969,7 @@ Example Response:
HTTP/1.1 201 CREATED
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Remove Application Permission
Expand All @@ -989,7 +989,7 @@ Example Response:
HTTP/1.1 204 NO CONTENT
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
Grant User Administrative Privileges
````````````````````````````````````
Expand All @@ -1014,4 +1014,4 @@ Example Response:
HTTP/1.1 201 CREATED
X_DEIS_API_VERSION: 1.1
X_DEIS_PLATFORM_VERSION: 1.4.0
X_DEIS_PLATFORM_VERSION: 1.4.1
2 changes: 1 addition & 1 deletion docs/troubleshooting_deis/index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ If you built ``deisctl`` locally or didn't use its installer, you may see an err
This is because ``deisctl`` could not find unit files for Deis locally. Run
``deisctl help refresh-units`` to see where ``deisctl`` searches, and then run a command such as
``deisctl refresh-units --tag=v1.4.0``, or set the ``$DEISCTL_UNITS`` environment variable to a directory
``deisctl refresh-units --tag=v1.4.1``, or set the ``$DEISCTL_UNITS`` environment variable to a directory
containing the unit files.

Other issues
Expand Down

0 comments on commit e372bc3

Please sign in to comment.