github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7720 from zmerlynn/merge-release-0.16-to-master

Browse Source 
Merge release 0.16 to master
This commit is contained in:
Robert Bailey 2015-05-04 11:50:59 -07:00
commit ed6f698531
1 changed files with 2 additions and 2 deletions
Show Stats 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 = "16.1+" // minor version, numeric possibly followed by "+" gitMinor string = "16.2+" // minor version, numeric possibly followed by "+"
gitVersion string = "v0.16.1-dev" // version from git, output of $(git describe) gitVersion string = "v0.16.2-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"
) )