chore(release): update version in master to v1.6.0-dev

mboersma · mboersma · commit 95746aadc8e2 · 2015-04-07T16:55:04.000-06:00
diff --git a/builder/image/Dockerfile b/builder/image/Dockerfile
@@ -63,4 +63,4 @@ ADD etc /etc
 ADD . /app
 RUN chown -R root:root /app
 
-ENV DEIS_RELEASE 1.5.0
+ENV DEIS_RELEASE 1.6.0-dev
diff --git a/builder/image/slugbuilder/Dockerfile b/builder/image/slugbuilder/Dockerfile
@@ -12,5 +12,5 @@ ADD ./builder/ /tmp/builder
 RUN /tmp/builder/install-buildpacks
 ENTRYPOINT ["/tmp/builder/build.sh"]
 
-ENV DEIS_RELEASE 1.5.0
+ENV DEIS_RELEASE 1.6.0-dev
 
diff --git a/builder/image/slugrunner/Dockerfile b/builder/image/slugrunner/Dockerfile
@@ -18,5 +18,5 @@ USER slug
 ENV HOME /app
 ENTRYPOINT ["/runner/init"]
 
-ENV DEIS_RELEASE 1.5.0
+ENV DEIS_RELEASE 1.6.0-dev
 
diff --git a/cache/image/Dockerfile b/cache/image/Dockerfile
@@ -6,4 +6,4 @@ WORKDIR /app
 CMD ["/app/bin/boot"]
 EXPOSE 6379
 
-ENV DEIS_RELEASE 1.5.0
+ENV DEIS_RELEASE 1.6.0-dev
diff --git a/client/deis.py b/client/deis.py
@@ -72,7 +72,7 @@
 from tabulate import tabulate
 from termcolor import colored
 
-__version__ = '1.5.0'
+__version__ = '1.6.0-dev'
 
 # what version of the API is this client compatible with?
 __api_version__ = '1.2'
diff --git a/client/setup.py b/client/setup.py
@@ -28,7 +28,7 @@
 
 
 setup(name='deis',
-      version='1.5.0',
+      version='1.6.0-dev',
       license=APACHE_LICENSE,
       description='Command-line Client for Deis, the open PaaS',
       author='OpDemand',
diff --git a/controller/Dockerfile b/controller/Dockerfile
@@ -31,4 +31,4 @@ ADD . /app
 # Create static resources
 RUN /app/manage.py collectstatic --settings=deis.settings --noinput
 
-ENV DEIS_RELEASE 1.5.0
+ENV DEIS_RELEASE 1.6.0-dev
diff --git a/controller/deis/__init__.py b/controller/deis/__init__.py
@@ -6,4 +6,4 @@
 
 from __future__ import absolute_import
 
-__version__ = '1.5.0'
+__version__ = '1.6.0-dev'
diff --git a/database/Dockerfile b/database/Dockerfile
@@ -22,5 +22,5 @@ CMD ["/app/bin/boot"]
 EXPOSE 5432
 ADD . /app
 
-ENV DEIS_RELEASE 1.5.0
+ENV DEIS_RELEASE 1.6.0-dev
 
diff --git a/deisctl/cmd/cmd.go b/deisctl/cmd/cmd.go
@@ -620,7 +620,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: v1.5.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.5.0
+1.6.0-dev
diff --git a/logger/image/Dockerfile b/logger/image/Dockerfile
@@ -5,5 +5,5 @@ EXPOSE 514
 
 ADD . /
 
-ENV DEIS_RELEASE 1.5.0
+ENV DEIS_RELEASE 1.6.0-dev
 
diff --git a/logspout/image/Dockerfile b/logspout/image/Dockerfile
@@ -7,5 +7,5 @@ CMD ["/bin/logspout"]
 
 ADD logspout /bin/logspout
 
-ENV DEIS_RELEASE 1.5.0
+ENV DEIS_RELEASE 1.6.0-dev
 
diff --git a/publisher/image/Dockerfile b/publisher/image/Dockerfile
@@ -3,5 +3,5 @@ FROM ubuntu-debootstrap:14.04
 ADD bin/publisher /usr/local/bin/publisher
 ENTRYPOINT ["/usr/local/bin/publisher"]
 
-ENV DEIS_RELEASE 1.5.0
+ENV DEIS_RELEASE 1.6.0-dev
 
diff --git a/registry/Dockerfile b/registry/Dockerfile
@@ -27,4 +27,4 @@ RUN DOCKER_BUILD=true /app/build.sh
 
 ADD . /app
 
-ENV DEIS_RELEASE 1.5.0
+ENV DEIS_RELEASE 1.6.0-dev
diff --git a/router/image/Dockerfile b/router/image/Dockerfile
@@ -24,5 +24,5 @@ ADD nginx.tgz /opt/nginx
 
 RUN rm nginx.tgz
 
-ENV DEIS_RELEASE 1.5.0
+ENV DEIS_RELEASE 1.6.0-dev
 
diff --git a/store/base/Dockerfile b/store/base/Dockerfile
@@ -9,5 +9,5 @@ RUN DOCKER_BUILD=true /tmp/build.sh
 # Add shared confd configuration
 ADD . /app
 
-ENV DEIS_RELEASE 1.5.0
+ENV DEIS_RELEASE 1.6.0-dev
 
diff --git a/version/version.go b/version/version.go
@@ -1,4 +1,4 @@
 package version
 
 // Version identifies this Deis product revision.
-const Version = "1.5.0"
+const Version = "1.6.0-dev"

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.5.0'`
	`9`	`+__version__ = '1.6.0-dev'`
Original file line number	Diff line number	Diff line change
`@@ -620,7 +620,7 @@ Usage:`
`620`	`620`	`Options:`
`621`	`621`	`-p --path=<target> where to save unit files [default: $HOME/.deis/units]`
`622`	`622`	`-t --tag=<tag> git tag, branch, or SHA to use when downloading unit files`
`623`		`- [default: v1.5.0]`
	`623`	`+ [default: master]`
`624`	`624`	`
`625`	`625`	`// parse command-line arguments`
`626`	`626`	`args, err := docopt.Parse(usage, argv, true, "", false)`