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

This commit is contained in:
Brendan Burns 2015-05-01 16:55:34 -07:00
commit 508eb309f8

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 = "16.0+" // minor version, numeric possibly followed by "+"
gitVersion string = "v0.16.0-dev" // version from git, output of $(git describe)
gitMinor string = "16.1+" // minor version, numeric possibly followed by "+"
gitVersion string = "v0.16.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"
)