github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-31 05:40:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9427 from GoogleCloudPlatform/revert-9426-release-0.18

Browse Source 
Revert "Cut release 0.18.2 with the fix for Docker + memory limits"
This commit is contained in:
Brendan Burns
2015-06-08 13:50:05 -07:00
parent cfcc6553a5 4546cbbb56
commit 09e1a044ad
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/version/base.go
View File

@@ -36,8 +36,8 @@ package version
var ( var (
// TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead. // TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead.
gitMajor string = "0" // major version, always numeric gitMajor string = "0" // major version, always numeric
gitMinor string = "18.2+" // minor version, numeric possibly followed by "+" gitMinor string = "18.1+" // minor version, numeric possibly followed by "+"
gitVersion string = "v0.18.2-dev" // version from git, output of $(git describe) gitVersion string = "v0.18.1-dev" // version from git, output of $(git describe)
gitCommit string = "" // sha1 from git, output of $(git rev-parse HEAD) 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" gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty"
) )