From 575bf6dcd09c84cb6622db3605cbc3abdb4e1baa Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Mon, 30 Mar 2015 11:02:57 -0700 Subject: [PATCH 1/2] Kubernetes version v0.14.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 401983dea50..5285ae33bcd 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 = "13.0+" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.13.0-dev" // version from git, output of $(git describe) + gitMinor string = "14.0" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.14.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 2ad77fd9e5397ac684ff17c0dae8e2b0b493fce9 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Mon, 30 Mar 2015 11:03:04 -0700 Subject: [PATCH 2/2] Kubernetes version v0.14.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 5285ae33bcd..b5f0574269c 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 = "14.0" // minor version, numeric possibly followed by "+" - gitVersion string = "v0.14.0" // version from git, output of $(git describe) + gitMinor string = "14.0+" // minor version, numeric possibly followed by "+" + gitVersion string = "v0.14.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" )