Merge pull request #10970 from zmerlynn/v0.21.1-merge-to-master

V0.21.1 merge to master
This commit is contained in:
Zach Loafman 2015-07-08 19:30:16 -07:00
commit 41f8907539

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