chore(release): update version to v1.1.0

mboersma · mboersma · commit 83c37edfac1c · 2014-12-09T19:46:48.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -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)
diff --git a/client/deis.py b/client/deis.py
@@ -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'
diff --git a/client/setup.py b/client/setup.py
@@ -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='info@opdemand.com',
       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',
diff --git a/contrib/coreos/user-data.example b/contrib/coreos/user-data.example
@@ -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
@@ -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
diff --git a/controller/deis/__init__.py b/controller/deis/__init__.py
@@ -6,4 +6,4 @@
 
 from __future__ import absolute_import
 
-__version__ = '1.1.0-dev'
+__version__ = '1.1.0'
diff --git a/deisctl/cmd/cmd.go b/deisctl/cmd/cmd.go
@@ -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)
diff --git a/deisctl/deis-version b/deisctl/deis-version
@@ -1 +1 @@
-1.1.0-dev
+1.1.0
diff --git a/deisctl/deisctl.go b/deisctl/deisctl.go
@@ -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
diff --git a/docs/installing_deis/install-deisctl.rst b/docs/installing_deis/install-deisctl.rst
@@ -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``:
 
@@ -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.
diff --git a/docs/installing_deis/install-platform.rst b/docs/installing_deis/install-platform.rst
@@ -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`.
 
diff --git a/docs/managing_deis/upgrading-deis.rst b/docs/managing_deis/upgrading-deis.rst
@@ -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"
@@ -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
diff --git a/docs/reference/api-v1.1.rst b/docs/reference/api-v1.1.rst
diff --git a/docs/troubleshooting_deis/index.rst b/docs/troubleshooting_deis/index.rst
diff --git a/version/version.go b/version/version.go

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@`
`6`	`6`
`7`	`7`	`from __future__ import absolute_import`
`8`	`8`
`9`		`-__version__ = '1.1.0-dev'`
	`9`	`+__version__ = '1.1.0'`
Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,7 @@ Usage:`
`625`	`625`	`Options:`
`626`	`626`	`-p --path=<target> where to save unit files [default: $HOME/.deis/units]`
`627`	`627`	`-t --tag=<tag> git tag, branch, or SHA to use when downloading unit files`
`628`		`- [default: master]`
	`628`	`+ [default: 1.1.0]`
`629`	`629`	`
`630`	`630`	`// parse command-line arguments`
`631`	`631`	`args, err := docopt.Parse(usage, argv, true, "", false)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`
`16`	`16`	`const (`
`17`	`17`	`// Version of deisctl client`
`18`		`- Version string = "1.1.0-dev"`
	`18`	`+ Version string = "1.1.0"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`// main exits with the return value of Command(os.Args[1:]), deferring all logic to`