Switch master to v0.2.1

mboersma · mboersma · commit 5f8d83be5076 · 2013-11-05T12:03:10.000-07:00
diff --git a/Berksfile b/Berksfile
@@ -3,7 +3,7 @@ site :opscode
 cookbook 'apt'
 cookbook 'rsyslog'
 cookbook 'sudo'
-#cookbook 'deis', '~> 0.1.1'
+#cookbook 'deis', '~> 0.2.1'
 
 # development cookbook
 cookbook 'deis', git: 'https://github.com/opdemand/deis-cookbook.git'
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -10,9 +10,9 @@
       "locked_version": "2.2.2"
     },
     "deis": {
-      "locked_version": "0.2.0",
+      "locked_version": "0.2.1",
       "git": "https://github.com/opdemand/deis-cookbook.git",
-      "ref": "bc763fdf2366654e527414f09d1742ca491b28a9"
+      "ref": "617d5a2627fdee92ade9499b4a87c6ff85a99c66"
     }
   }
 }
diff --git a/client/deis.py b/client/deis.py
@@ -63,7 +63,7 @@
 import requests
 import tempfile
 
-__version__ = '0.2.0'
+__version__ = '0.2.1'
 
 
 class Session(requests.Session):
diff --git a/client/setup.py b/client/setup.py
@@ -32,7 +32,7 @@
 
 # pylint: disable=W0142
 setup(name='deis',
-      version='0.2.0',
+      version='0.2.1',
       license=APACHE_LICENSE,
       description='Command-line Client for Deis',
       author='OpDemand',
diff --git a/deis/__init__.py b/deis/__init__.py
@@ -4,4 +4,4 @@
 the api, provider, cm, and web Django apps.
 """
 
-__version__ = '0.2.0'
+__version__ = '0.2.1'

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@`
`10`	`10`	`"locked_version": "2.2.2"`
`11`	`11`	`},`
`12`	`12`	`"deis": {`
`13`		`- "locked_version": "0.2.0",`
	`13`	`+ "locked_version": "0.2.1",`
`14`	`14`	`"git": "https://github.com/opdemand/deis-cookbook.git",`
`15`		`- "ref": "bc763fdf2366654e527414f09d1742ca491b28a9"`
	`15`	`+ "ref": "617d5a2627fdee92ade9499b4a87c6ff85a99c66"`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`}`