github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/release-0.17' into merge-release-0.17-to-master

pull/6/head
Zach Loafman 2015-05-21 13:26:42 -07:00
parent 6b428ef1a8 4c118f66b4
commit 7196ace711
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 (
// TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead.
gitMajor string = "0" // major version, always numeric
gitMinor string = "17.0+" // minor version, numeric possibly followed by "+"
gitVersion string = "v0.17.0-dev" // version from git, output of $(git describe)
gitMinor string = "17.1+" // minor version, numeric possibly followed by "+"
gitVersion string = "v0.17.1-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"
)