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

mboersma · mboersma · commit d5b7ffa7b4f2 · 2015-10-06T15:13:39.000-06:00
diff --git a/builder/rootfs/Dockerfile b/builder/rootfs/Dockerfile
@@ -58,4 +58,4 @@ RUN passwd -u git
 
 COPY . /
 
-ENV DEIS_RELEASE 1.11.0
+ENV DEIS_RELEASE 1.12.0-dev
diff --git a/builder/rootfs/usr/local/src/slugbuilder/Dockerfile b/builder/rootfs/usr/local/src/slugbuilder/Dockerfile
@@ -11,4 +11,4 @@ ADD ./builder/ /tmp/builder
 RUN /tmp/builder/install-buildpacks
 ENTRYPOINT ["/tmp/builder/build.sh"]
 
-ENV DEIS_RELEASE 1.11.0
+ENV DEIS_RELEASE 1.12.0-dev
diff --git a/builder/rootfs/usr/local/src/slugrunner/Dockerfile b/builder/rootfs/usr/local/src/slugrunner/Dockerfile
@@ -17,7 +17,7 @@ USER slug
 ENV HOME /app
 ENTRYPOINT ["/runner/init"]
 
-ENV DEIS_RELEASE 1.11.0
+ENV DEIS_RELEASE 1.12.0-dev
 
 ONBUILD RUN mkdir -p /app
 ONBUILD WORKDIR /app
diff --git a/client/deis-version b/client/deis-version
@@ -1 +1 @@
-1.11.0
+1.12.0-dev
diff --git a/controller/Dockerfile b/controller/Dockerfile
@@ -29,4 +29,4 @@ ADD . /app
 # Create static resources
 RUN /app/manage.py collectstatic --settings=deis.settings --noinput
 
-ENV DEIS_RELEASE 1.11.0
+ENV DEIS_RELEASE 1.12.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.11.0'
+__version__ = '1.12.0-dev'
diff --git a/database/Dockerfile b/database/Dockerfile
@@ -20,4 +20,4 @@ CMD ["/app/bin/boot"]
 EXPOSE 5432
 ADD . /app
 
-ENV DEIS_RELEASE 1.11.0
+ENV DEIS_RELEASE 1.12.0-dev
diff --git a/deisctl/client/client.go b/deisctl/client/client.go
@@ -258,7 +258,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.11.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.11.0
+1.12.0-dev
diff --git a/logger/image/Dockerfile b/logger/image/Dockerfile
@@ -7,4 +7,4 @@ EXPOSE 8088
 
 ADD . /
 
-ENV DEIS_RELEASE 1.11.0
+ENV DEIS_RELEASE 1.12.0-dev
diff --git a/logspout/image/Dockerfile b/logspout/image/Dockerfile
@@ -6,4 +6,4 @@ CMD ["/bin/logspout"]
 
 ADD logspout /bin/logspout
 
-ENV DEIS_RELEASE 1.11.0
+ENV DEIS_RELEASE 1.12.0-dev
diff --git a/mesos/template b/mesos/template
@@ -6,4 +6,4 @@ COPY build-mesos.sh /tmp/build.sh
 
 RUN DOCKER_BUILD=true MESOS="#VERSION#" /tmp/build.sh
 
-ENV DEIS_RELEASE 1.11.0
+ENV DEIS_RELEASE 1.12.0-dev
diff --git a/mesos/zookeeper/Dockerfile b/mesos/zookeeper/Dockerfile
@@ -15,4 +15,4 @@ VOLUME ["/opt/zookeeper-data"]
 
 ENTRYPOINT ["/app/bin/boot"]
 
-ENV DEIS_RELEASE 1.11.0
+ENV DEIS_RELEASE 1.12.0-dev
diff --git a/publisher/image/Dockerfile b/publisher/image/Dockerfile
@@ -7,4 +7,4 @@ RUN apk add --update-cache curl && rm -rf /var/cache/apk/*
 ADD bin/publisher /usr/local/bin/publisher
 ENTRYPOINT ["/usr/local/bin/publisher"]
 
-ENV DEIS_RELEASE 1.11.0
+ENV DEIS_RELEASE 1.12.0-dev
diff --git a/registry/Dockerfile b/registry/Dockerfile
@@ -25,4 +25,4 @@ RUN DOCKER_BUILD=true /app/build.sh
 
 ADD . /app
 
-ENV DEIS_RELEASE 1.11.0
+ENV DEIS_RELEASE 1.12.0-dev
diff --git a/router/Dockerfile b/router/Dockerfile
@@ -27,4 +27,4 @@ RUN build
 CMD ["boot"]
 EXPOSE 80 2222 9090
 
-ENV DEIS_RELEASE 1.11.0
+ENV DEIS_RELEASE 1.12.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.11.0
+ENV DEIS_RELEASE 1.12.0-dev
 
diff --git a/swarm/image/Dockerfile b/swarm/image/Dockerfile
@@ -9,4 +9,4 @@ ENV SWARM_HOST :2375
 EXPOSE 2375
 VOLUME $HOME/.swarm
 
-ENV DEIS_RELEASE 1.11.0
+ENV DEIS_RELEASE 1.12.0-dev
diff --git a/version/version.go b/version/version.go
@@ -1,7 +1,7 @@
 package version
 
 // Version identifies this Deis product revision.
-const Version = "1.11.0"
+const Version = "1.12.0-dev"
 
 // API identifies the latest Deis api verison
 const APIVersion = "1.7"

Original file line number	Diff line number	Diff line change
`@@ -58,4 +58,4 @@ RUN passwd -u git`
`58`	`58`
`59`	`59`	`COPY . /`
`60`	`60`
`61`		`-ENV DEIS_RELEASE 1.11.0`
	`61`	`+ENV DEIS_RELEASE 1.12.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.11.0'`
	`9`	`+__version__ = '1.12.0-dev'`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ Usage:`
`258`	`258`	`Options:`
`259`	`259`	`-p --path=<target> where to save unit files [default: $HOME/.deis/units]`
`260`	`260`	`-t --tag=<tag> git tag, branch, or SHA to use when downloading unit files`
`261`		`- [default: v1.11.0]`
	`261`	`+ [default: master]`
`262`	`262`	`
`263`	`263`	`// parse command-line arguments`
`264`	`264`	`args, err := docopt.Parse(usage, argv, true, "", false)`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,4 @@ EXPOSE 8088`
`7`	`7`
`8`	`8`	`ADD . /`
`9`	`9`
`10`		`-ENV DEIS_RELEASE 1.11.0`
	`10`	`+ENV DEIS_RELEASE 1.12.0-dev`