Skip to content

Commit

Permalink
chore(release): update version to v1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mboersma committed Dec 10, 2014
1 parent 63e5e54 commit 83c37ed
Show file tree
Hide file tree
Showing 15 changed files with 176 additions and 59 deletions.
136 changes: 126 additions & 10 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
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](http://ci.deis.io/buildStatus/icon?job=test-master)](http://ci.deis.io/job/test-master/)
[![Current Release](http://img.shields.io/badge/release-v1.0.2-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.0.2)
[![Current Release](http://img.shields.io/badge/release-v1.1.0-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.1.0)
[![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
2 changes: 1 addition & 1 deletion client/deis.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
import requests
from termcolor import colored

__version__ = '1.1.0-dev'
__version__ = '1.1.0'

# what version of the API is this client compatible with?
__api_version__ = '1.1'
Expand Down
6 changes: 3 additions & 3 deletions client/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@


setup(name='deis',
version='1.0.2',
version='1.1.0',
license=APACHE_LICENSE,
description='Command-line Client for Deis, the open PaaS',
author='OpDemand',
author_email='[email protected]',
url='https://github.com/deis/deis',
keywords=[
'opdemand', 'deis', 'paas', 'cloud', 'chef', 'docker', 'heroku',
'opdemand', 'deis', 'paas', 'cloud', 'coreos', 'docker', 'heroku',
'aws', 'ec2', 'rackspace', 'digitalocean', 'gce'
],
classifiers=[
'Development Status :: 4 - Beta',
'Development Status :: 5 - Production/Stable',
'Environment :: Console',
'Intended Audience :: Developers',
'Intended Audience :: Information Technology',
Expand Down
4 changes: 2 additions & 2 deletions contrib/coreos/user-data.example
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,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.0.2'
ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.1.0'
- name: ntpdate.service
command: start
- name: timedate-ntp-synchronization.service
Expand All @@ -59,7 +59,7 @@ coreos:
write_files:
- path: /etc/deis-release
content: |
DEIS_RELEASE=v1.0.2
DEIS_RELEASE=v1.1.0
- 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
2 changes: 1 addition & 1 deletion controller/deis/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

from __future__ import absolute_import

__version__ = '1.1.0-dev'
__version__ = '1.1.0'
2 changes: 1 addition & 1 deletion deisctl/cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ Usage:
Options:
-p --path=<target> where to save unit files [default: $HOME/.deis/units]
-t --tag=<tag> git tag, branch, or SHA to use when downloading unit files
[default: master]
[default: 1.1.0]
`
// parse command-line arguments
args, err := docopt.Parse(usage, argv, true, "", false)
Expand Down
2 changes: 1 addition & 1 deletion deisctl/deis-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0-dev
1.1.0
2 changes: 1 addition & 1 deletion deisctl/deisctl.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

const (
// Version of deisctl client
Version string = "1.1.0-dev"
Version string = "1.1.0"
)

// main exits with the return value of Command(os.Args[1:]), deferring all logic to
Expand Down
8 changes: 4 additions & 4 deletions docs/installing_deis/install-deisctl.rst
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.0.2
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.1.0
This installs ``deisctl`` version 1.0.2 to the current directory, and downloads the matching
This installs ``deisctl`` version 1.1.0 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.0.2-linux-amd64.run
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.1.0-linux-amd64.run

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

Expand Down
3 changes: 2 additions & 1 deletion docs/managing_deis/upgrading-deis.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ to CoreOS 494.1.0 or later, and configuring Docker to access deis-registry. See
$ ssh deis-1.example.com # repeat these steps for each node
$ sudo -i
$ mkdir -p /etc/systemd/system/docker.service.d
$ cat <<EOF > /etc/systemd/system/docker.service.d/50-insecure-registry.conf
[Service]
Environment="DOCKER_OPTS=--insecure-registry 10.0.0.0/8 --insecure-registry 172.16.0.0/12 --insecure-registry 192.168.0.0/16"
Expand Down Expand Up @@ -200,7 +201,7 @@ To update CoreOS, run the following commands:
$ ssh core@<server ip>
$ sudo su
$ echo GROUP=beta > /etc/coreos/update.conf
$ echo GROUP=stable > /etc/coreos/update.conf
$ systemctl unmask update-engine.service
$ systemctl start update-engine.service
$ update_engine_client -update
Expand Down
Loading

0 comments on commit 83c37ed

Please sign in to comment.