From ad44234f7152e9c66bc2853575445c7071335e57 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Mon, 15 Dec 2014 16:57:39 -0800 Subject: [PATCH 1/2] Kubernetes version v0.7.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 60f24e4e419..ddfe083a48b 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-dev" // version from git, output of $(git describe) + gitMinor string = "7.0" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.7.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 feb80f0c52f895689dac020fc972256d93642b46 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Mon, 15 Dec 2014 16:57:39 -0800 Subject: [PATCH 2/2] Kubernetes version v0.7.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 ddfe083a48b..57c34a4135b 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 = "7.0" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.7.0" // version from git, output of $(git describe) + gitMinor string = "7.0+" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.7.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" )