From ecca42643b91a7117de8cd385b64e6bafecefd65 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Mon, 2 Mar 2015 20:04:24 -0800 Subject: [PATCH 1/2] Kubernetes version v0.12.0 --- 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 5ef983cfbbb5e..478dbf125632b 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 = "11.0+" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.11.0-dev" // version from git, output of $(git describe) + gitMinor string = "12.0" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.12.0" // 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 2bbc59e81e93bb5c073b5dcc51a5c2e1a762c609 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Mon, 2 Mar 2015 20:04:35 -0800 Subject: [PATCH 2/2] Kubernetes version v0.12.0-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 478dbf125632b..e90a565e9e8cf 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 = "12.0" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.12.0" // version from git, output of $(git describe) + gitMinor string = "12.0+" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.12.0-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" )