From ffe8a489d55c2424533f40df66a4cbacc925b84d Mon Sep 17 00:00:00 2001 From: Jeff Lowdermlk Date: Mon, 8 Dec 2014 16:42:41 -0800 Subject: [PATCH 1/3] Fix conditional on grains.docker_opts in docker-defaults (cherry picked from commit 0007257bce01dd7637fd673dcf3aa656c53f64b3) --- cluster/saltbase/salt/docker/docker-defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/saltbase/salt/docker/docker-defaults b/cluster/saltbase/salt/docker/docker-defaults index ed75833e8ad..46cbd9e0587 100644 --- a/cluster/saltbase/salt/docker/docker-defaults +++ b/cluster/saltbase/salt/docker/docker-defaults @@ -1,5 +1,5 @@ DOCKER_OPTS="" -{% if grains.docker_opts is defined %} +{% if grains.docker_opts %} DOCKER_OPTS="${DOCKER_OPTS} {{grains.docker_opts}}" {% endif %} DOCKER_OPTS="${DOCKER_OPTS} --bridge cbr0 --iptables=false --ip-masq=false -r=false" From 6351efc43db8702072bfd31f3e0af9ea444115ac Mon Sep 17 00:00:00 2001 From: Jeff Lowdermlk Date: Tue, 9 Dec 2014 10:22:40 -0800 Subject: [PATCH 2/3] Kubernetes version v0.6.1 --- pkg/version/base.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/version/base.go b/pkg/version/base.go index 717c0ba8332..a6012c300f3 100644 --- a/pkg/version/base.go +++ b/pkg/version/base.go @@ -36,8 +36,8 @@ package version var ( // TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead. gitMajor string = "0" // major version, always numeric - gitMinor string = "6.0" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.6.0" // version from git, output of $(git describe) + gitMinor string = "6.1" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.6.1" // version from git, output of $(git describe) gitCommit string = "" // sha1 from git, output of $(git rev-parse HEAD) gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty" ) From 278e7ac2325a1d74b453b3d19aedeab863c350e2 Mon Sep 17 00:00:00 2001 From: Jeff Lowdermlk Date: Tue, 9 Dec 2014 10:22:40 -0800 Subject: [PATCH 3/3] Kubernetes version v0.6.1-dev --- pkg/version/base.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/version/base.go b/pkg/version/base.go index a6012c300f3..a0cbf70864a 100644 --- a/pkg/version/base.go +++ b/pkg/version/base.go @@ -36,8 +36,8 @@ package version var ( // TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead. gitMajor string = "0" // major version, always numeric - gitMinor string = "6.1" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.6.1" // version from git, output of $(git describe) + gitMinor string = "6.1+" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.6.1-dev" // version from git, output of $(git describe) gitCommit string = "" // sha1 from git, output of $(git rev-parse HEAD) gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty" )