Skip to content

Commit

Permalink
Merge pull request deis#2461 from mboersma/release-1.0.0
Browse files Browse the repository at this point in the history
chore(release): update version to v1.0.0
  • Loading branch information
mboersma committed Nov 11, 2014
2 parents ec45024 + 1b66674 commit d0bdead
Show file tree
Hide file tree
Showing 15 changed files with 100 additions and 25 deletions.
77 changes: 77 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,79 @@
### v0.15.1 -> v1.0.0

#### Features

- [`afaeb82`](https://github.com/deis/deis/commit/afaeb8218423779fd083c501c9f05d07a37f8322) (all): Do not commit a local vagrant settings
- [`d34146a`](https://github.com/deis/deis/commit/d34146a980c3da00a29c94625fb5182041beaf43) provision-rackspace: added optional parameter to specify environment
- [`97ce5b2`](https://github.com/deis/deis/commit/97ce5b25ca17eb1e90a5a3e4c21745b1c22c7ca5) client: optional drink of choice
- [`270375d`](https://github.com/deis/deis/commit/270375d3d75f048f6497d0ca86c8c5c08ad6f6a5) client: Add error message when writing settings fails.
- [`7125060`](https://github.com/deis/deis/commit/7125060e2fc1bb898c165ed6bacd57531397475f) coreos: use custom image in toolbox
- [`47432c3`](https://github.com/deis/deis/commit/47432c3e647d4f300376a186772f508a777258ef) publisher: use godep
- [`dd1a3e1`](https://github.com/deis/deis/commit/dd1a3e100cb04fb8b4933f27c5401638b3941fbd) logspout: use godep.

#### Fixes

- [`42a7465`](https://github.com/deis/deis/commit/42a746557907483ad0eb7a3265fc2ef37d392a38) builder: avoid return an error if is not possible remove an image
- [`50eb2e7`](https://github.com/deis/deis/commit/50eb2e7a868f068fdc48904242e9bd8de49bf1cb) docs: fixup markdown
- [`62c628f`](https://github.com/deis/deis/commit/62c628f81443dc0ac2050575814b7fbe9314ee91) publisher: do not publish older app versions
- [`b794191`](https://github.com/deis/deis/commit/b794191b21ba5e0a62536f59510a18c66c7e0f2b) docs: use /deis/logs/host|port, not /deis/logger/
- [`dd1e3f3`](https://github.com/deis/deis/commit/dd1e3f3753564a0f2f9ba9b1bfffc8e8c6d56ee7) (all): Corrected required cores version
- [`f26c973`](https://github.com/deis/deis/commit/f26c973779cc5999158085b3f041bbe047bdd749) router: only add x-forwarded-proto on https
- [`2c622b5`](https://github.com/deis/deis/commit/2c622b506c7b30ed6500a7325e4a86999c4d71a8) deisctl: make restart call start and stop properly
- [`3763748`](https://github.com/deis/deis/commit/37637487e70d7141d26186fe5a9df76e817c321e) router: remove store gateway body limit
- [`d80ea91`](https://github.com/deis/deis/commit/d80ea91712c6afc2c9903a03e19c6d62ba22742c) client: dump log line if we fail to parse tag
- [`c6224cc`](https://github.com/deis/deis/commit/c6224cc7ade854aac2b46ec96d41b1173baa4b50) docs: fixup links
- [`2ed4a84`](https://github.com/deis/deis/commit/2ed4a84f5870e27c4ecc80ef2991cd49c5145f8d) builder: force newline
- [`c0cbde8`](https://github.com/deis/deis/commit/c0cbde8bbe53df5ce04b690d60379948a8d01b60) deisctl: handle "deisctl help <command>" consistently
- [`1da3d19`](https://github.com/deis/deis/commit/1da3d19a9c961efa13837ac5e5dde0ef196fdbad) logspout: bump packet size to 1048576
- [`69117bd`](https://github.com/deis/deis/commit/69117bdd5fe5da5831a8f3b4878e332ab392313b) builder: remove container only if $JOB is defined
- [`cbf38e5`](https://github.com/deis/deis/commit/cbf38e500b66716438a1954a4e7e1f528d842e04) deisctl/units: mount deis-store only if it isn't mounted
- [`2d1fd03`](https://github.com/deis/deis/commit/2d1fd0363f60b8a463bc2837e02081974dfbd3c4) store: remove pg_num reconfiguration"
- [`833bfd7`](https://github.com/deis/deis/commit/833bfd75a21ebd0bc4ad3b20193a62372e8c8d36) registry: prefix "apt-get install" with "apt-get update"
- [`3056cd9`](https://github.com/deis/deis/commit/3056cd94f747178aae3f0590768f02feeb98d18a) build.sh: fail on errors in Dockerfile two-tier builds
- [`7a4ac38`](https://github.com/deis/deis/commit/7a4ac3836f1e93fb884a0cd6f2252c3ecd21dc6a) tests: Allow TLS
- [`dbcb2a6`](https://github.com/deis/deis/commit/dbcb2a64bae65713c727c865828516089aadd67d) logspout: remove binary from git
- [`8c6c37b`](https://github.com/deis/deis/commit/8c6c37b509feeb0a0da73a9388cfd66fbae3e1a6) client: return lowercase app name

#### Documentation

- [`2af6c3e`](https://github.com/deis/deis/commit/2af6c3e8449aff00a921c3e44539c951db3421e2) (all): add Deis resource requirements
- [`fdbabb3`](https://github.com/deis/deis/commit/fdbabb33567476c2d8e583ea2a061d9f025a0ad5) README: remove "open an issue for new providers" language
- [`3812b30`](https://github.com/deis/deis/commit/3812b30dcce1355aa7467fe7528dd31eafe6588d) readme: update readme in prep for stable
- [`1d08e5a`](https://github.com/deis/deis/commit/1d08e5a7910f4f806d876c7d62caa38a54786a44) (all): doc edits for stable release
- [`5e05482`](https://github.com/deis/deis/commit/5e05482dfb2dab66c7118f39ac9eb7a1c8128f47) managing_deis: add store to backup/restore docs
- [`6efb5ef`](https://github.com/deis/deis/commit/6efb5efa8ac4854c92a9dd9c50d338afca22f609) customizing_deis: create new section for customization
- [`cbc8bf4`](https://github.com/deis/deis/commit/cbc8bf414a97c66caa5336535a31a9c8d7282719) understanding_deis: refactor architecture, concepts, components
- [`205f7a6`](https://github.com/deis/deis/commit/205f7a6d4ee969fce1716fd7a13bdfa3d9ea9fe9) installing_deis: add quick start guide
- [`021e732`](https://github.com/deis/deis/commit/021e73252b3cd261cef84c4c81b29be2d5b6b497) using-deis: add missing sections on limits and tags
- [`3ad8f9b`](https://github.com/deis/deis/commit/3ad8f9b4c69643515ba15a9f27d9607f33bc4868) test_plan: add a formal doc describing QA strategy & scope
- [`797d3ae`](https://github.com/deis/deis/commit/797d3ae33820905df3860b42aea55341aa66d5eb) (all): flesh out platform logging docs; add logspout docs
- [`c0228e5`](https://github.com/deis/deis/commit/c0228e5170885a22db88ec4e00d3cceeb03bb44d) managing_deis: flesh out platform monitoring docs
- [`b87a7ae`](https://github.com/deis/deis/commit/b87a7ae9e56873dc5b712bdc57c302f2933fb481) install/upgrade: highlight that deisctl must match Deis' version
- [`05991be`](https://github.com/deis/deis/commit/05991be548def382f3b7375e984fc62ba52113f7) installing_deis: added reference to optional environment parameter
- [`15c4a94`](https://github.com/deis/deis/commit/15c4a94d97e502975323c15631637b6e7b6d1dd0) installing_deis: fixed formatting issue
- [`fe4ce5b`](https://github.com/deis/deis/commit/fe4ce5bb57b8cfa07755884aa90ec676a79dd27a) upgrading: mention CoreOS minimum requirement
- [`8434d05`](https://github.com/deis/deis/commit/8434d054d5269c44fe24c95d60c1dc951ef8759d) installing_deis: import vagrant documentation
- [`f1264ac`](https://github.com/deis/deis/commit/f1264acaf4fdd7c9764d7d08b18796354125f8c3) troubleshooting: added instructions on manually updating CoreOS
- [`596ec95`](https://github.com/deis/deis/commit/596ec95b3fb7bb0016d8a873be14129062a21b4a) installing_deis: add load balancer docs
- [`3513370`](https://github.com/deis/deis/commit/35133703d02f06e94c6e437aaad35a036deddf61) installing_deis: import rackspace provisioning docs
- [`d188ecc`](https://github.com/deis/deis/commit/d188ecc19ee44f6ff4a50cbfe79f06da4b4c07be) hacking: note that Docker 1.3.1 may need --insecure-registry
- [`7c05e78`](https://github.com/deis/deis/commit/7c05e7817004392f8bb07802a3692e1028ce1326) testing: remove section about disabling TLS in boot2docker
- [`9e266cb`](https://github.com/deis/deis/commit/9e266cb2bc9174c8ff4ced4e6ea181e3f52d9329) managing_deis: re-issuing auth tokens
- [`c45348b`](https://github.com/deis/deis/commit/c45348b835ab00face8c43b04f79f7e2aca8840d) (all): specify required CoreOS version
- [`e3d97ea`](https://github.com/deis/deis/commit/e3d97ea04ee1b19f8b57521c5d08ef47bb3e6918) managing_deis: add MDS removal instructions
- [`32735f0`](https://github.com/deis/deis/commit/32735f01970cb1edad4c3db25c5a53c8bc9980f5) installing_deis: import gce provisioning docs

#### Maintenance

- [`0fd83c1`](https://github.com/deis/deis/commit/0fd83c1714231cc745abbd71fd99f4f77753b2cc) (all): update CoreOS to 494.0.0
- [`33b27d9`](https://github.com/deis/deis/commit/33b27d94e16da80ad2218823a623fc7681280a12) controller: update South to 1.0.1
- [`4c63670`](https://github.com/deis/deis/commit/4c63670b3355e2c20ae89eab736003e0d7868fa8) controller: update djangorestframework to 2.4.4
- [`08f5bf1`](https://github.com/deis/deis/commit/08f5bf1d0336cbed3bc84fc89f615dea7c7fd7a3) contrib/rackspace: bump CoreOS to 490.0.0
- [`793a880`](https://github.com/deis/deis/commit/793a880163d0d0506614ef951bba04fd3fcfc640) provision-rackspace: bumped coreos image version
- [`9fc6637`](https://github.com/deis/deis/commit/9fc663722420f289446dbab275592b9f68f10716) store: bump Ceph to "giant" release
- [`38185c3`](https://github.com/deis/deis/commit/38185c3cb5c4058c2625d77777e29567e3ee5e6a) (all): bump CoreOS to 490.0.0
- [`217261f`](https://github.com/deis/deis/commit/217261f969016033c905dccdf3e270c036f7e365) release: update version in master to v0.15.1+git

### v0.15.0 -> v0.15.1

#### Features
Expand Down Expand Up @@ -39,6 +115,7 @@

#### Maintenance

- [`b7dd0d4`](https://github.com/deis/deis/commit/b7dd0d4fc45925de209ac01bebe3b54c220ae915) release: update version to v0.15.1
- [`78c207f`](https://github.com/deis/deis/commit/78c207faf2625f366b5a9322b6ec024323439010) controller: update python-etcd to 0.3.2
- [`57e650a`](https://github.com/deis/deis/commit/57e650a1091aedd4ed3dda592f38ce111b3fafc5) builder: update requests to 2.4.3
- [`dab7a94`](https://github.com/deis/deis/commit/dab7a94461835d9b686824db72e61c08fe4dcf41) client: update requests to 2.4.3
Expand Down
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-v0.15.1-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v0.15.1)
[![Current Release](http://img.shields.io/badge/release-v1.0.0-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.0.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 @@ -67,7 +67,7 @@
import requests
from termcolor import colored

__version__ = '0.15.1+git'
__version__ = '1.0.0'


locale.setlocale(locale.LC_ALL, '')
Expand Down
2 changes: 1 addition & 1 deletion client/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@


setup(name='deis',
version='0.15.1',
version='1.0.0',
license=APACHE_LICENSE,
description='Command-line Client for Deis, the open PaaS',
author='OpDemand',
Expand Down
4 changes: 0 additions & 4 deletions contrib/bumpver/bump_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,6 @@ Deis (pronounced DAY-iss) is an open source PaaS that makes it easy to deploy an
[![Current Release](http://img.shields.io/badge/release-v0.12.0-blue.svg)](https://github.com/deis/deis/releases/tag/v0.12.0)
![Deis Graphic](https://s3-us-west-2.amazonaws.com/deis-images/deis-graphic.png)
Deis is pre-release software. The current release is [v0.12.0](https://github.com/deis/deis/tree/v0.12.0). Until there is a stable release, we recommend you check out the latest ["master" branch](https://github.com/deis/deis) code and refer to the [latest documentation](http://docs.deis.io/en/latest/). Upgrading from a previous Deis release? See [Upgrading Deis](http://docs.deis.io/en/latest/installing_deis/upgrading-deis/) for additional information.
`

var mdAfter = `
Expand All @@ -326,6 +324,4 @@ Deis (pronounced DAY-iss) is an open source PaaS that makes it easy to deploy an
[![Current Release](http://img.shields.io/badge/release-v0.15.1-blue.svg)](https://github.com/deis/deis/releases/tag/v0.15.1)
![Deis Graphic](https://s3-us-west-2.amazonaws.com/deis-images/deis-graphic.png)
Deis is pre-release software. The current release is [v0.15.1](https://github.com/deis/deis/tree/v0.15.1). Until there is a stable release, we recommend you check out the latest ["master" branch](https://github.com/deis/deis) code and refer to the [latest documentation](http://docs.deis.io/en/latest/). Upgrading from a previous Deis release? See [Upgrading Deis](http://docs.deis.io/en/latest/installing_deis/upgrading-deis/) for additional information.
`
6 changes: 3 additions & 3 deletions contrib/coreos/user-data.example
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ coreos:

[Service]
Type=oneshot
ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 0.15.1'
ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.0.0'
write_files:
- path: /etc/deis-release
content: |
DEIS_RELEASE=v0.15.1
DEIS_RELEASE=v1.0.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 Expand Up @@ -113,4 +113,4 @@ write_files:
content: |
TOOLBOX_DOCKER_IMAGE=ubuntu-debootstrap
TOOLBOX_DOCKER_TAG=14.04
TOOLBOX_USER=root
TOOLBOX_USER=root
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__ = '0.15.1+git'
__version__ = '1.0.0'
2 changes: 1 addition & 1 deletion deisctl/cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,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: v1.0.0]
`
// parse command-line arguments
args, err := docopt.Parse(usage, argv, true, "", false)
Expand Down
1 change: 1 addition & 0 deletions deisctl/deis-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.0.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 = "0.15.1+git"
Version string = "1.0.0"
)

// main exits with the return value of Command(os.Args[1:]), deferring all logic to
Expand Down
5 changes: 3 additions & 2 deletions docs/contributing/releases.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,17 @@ deis repo
.. code-block:: console
$ ./contrib/bumpver/bumpver X.Y.Z \
version/version.go \
README.md \
client/deis.py \
client/setup.py \
contrib/coreos/user-data.example \
controller/deis/__init__.py \
deisctl/deis-version \
deisctl/deisctl.go \
docs/contributing/test_plan.rst \
docs/installing_deis/install-deisctl.rst \
docs/managing_deis/upgrading-deis.rst \
version/version.go
docs/managing_deis/upgrading-deis.rst
- Edit deisctl/cmd/cmd.go and change the default in the RefreshUnits usage string
(near the bottom of the file) from ``[master]`` to ``[vX.Y.Z]``.
Expand Down
4 changes: 2 additions & 2 deletions docs/contributing/test_plan.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ any significant revision to the document.
References
----------

- "Testing Deis": http://docs.deis.io/en/v0.15.1/contributing/testing/
- "Changes Must Include Tests": http://docs.deis.io/en/v0.15.1/contributing/standards/#include-tests
- "Testing Deis": http://docs.deis.io/en/v1.0.0/contributing/testing/
- "Changes Must Include Tests": http://docs.deis.io/en/v1.0.0/contributing/standards/#include-tests


Introduction
Expand Down
12 changes: 6 additions & 6 deletions docs/installing_deis/install-deisctl.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ with the following command:
.. code-block:: console
$ cd ~/bin
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 0.15.1
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.0.0
This installs deisctl to the current directory, and refreshes the Deis systemd unit files used to
schedule the components. Link it to /usr/local/bin, so it will be in your PATH:
Expand All @@ -31,10 +31,10 @@ schedule the components. Link it to /usr/local/bin, so 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-0.15.1-linux-amd64.run
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.0.0-linux-amd64.run

.. image:: download-osx-brightgreen.svg
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-0.15.1-darwin-amd64.run
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.0.0-darwin-amd64.run

Then run the downloaded file as a shell script. Append ``--help`` to see what options
are available.
Expand All @@ -48,13 +48,13 @@ Builds are hosted on an S3 bucket at this URL format:

``https://s3-us-west-2.amazonaws.com/opdemand/deisctl-<VERSION>-<darwin|linux>-amd64.run``

For example, the deisctl release for Deis version 0.15.1 can be downloaded here:
For example, the deisctl release for Deis version 1.0.0 can be downloaded here:

.. image:: download-linux-brightgreen.svg
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-0.15.1-linux-amd64.run
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.0.0-linux-amd64.run

.. image:: download-osx-brightgreen.svg
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-0.15.1-darwin-amd64.run
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.0.0-darwin-amd64.run

Building from Source
--------------------
Expand Down
2 changes: 1 addition & 1 deletion docs/managing_deis/upgrading-deis.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Use the following steps to perform an in-place upgrade of your Deis cluster.
.. code-block:: console
$ deisctl stop platform && deisctl uninstall platform
$ deisctl config platform set version=v0.15.1
$ deisctl config platform set version=v1.0.0
$ deisctl install platform
$ deisctl start platform
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package version

const Version = "0.15.1+git"
const Version = "1.0.0"

0 comments on commit d0bdead

Please sign in to comment.