Merge pull request #10567 from alex-mohr/merge-release-0.20-to-master

Merge release 0.20.2 to master
This commit is contained in:
Zach Loafman 2015-06-30 15:10:21 -07:00
commit a80cbe6069

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