chore(release): update version in master to 1.2.0-dev

leroy-chen · Dec 10, 2014 · f21159f · f21159f
1 parent 83c37ed
commit f21159f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/client/deis.py b/client/deis.py
@@ -69,7 +69,7 @@
 import requests
 from termcolor import colored
 
-__version__ = '1.1.0'
+__version__ = '1.2.0-dev'
 
 # what version of the API is this client compatible with?
 __api_version__ = '1.1'

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'
+__version__ = '1.2.0-dev'
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: 1.1.0]
+                       [default: master]
 `
 	// 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
+1.2.0-dev
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"
+	Version string = "1.2.0-dev"
 )
 
 // main exits with the return value of Command(os.Args[1:]), deferring all logic to

diff --git a/version/version.go b/version/version.go
@@ -1,3 +1,3 @@
 package version
 
-const Version = "1.1.0"
+const Version = "1.2.0-dev"
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'
		__version__ = '1.2.0-dev'