Merge pull request #11103 from brendandburns/v1.0.0-merge-to-master

V1.0.0 merge to master
This commit is contained in:
Zach Loafman 2015-07-10 21:13:41 -07:00
commit 1b370599cc

View File

@ -35,9 +35,9 @@ package version
var (
// TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead.
gitMajor string = "0" // major version, always numeric
gitMinor string = "21.2+" // minor version, numeric possibly followed by "+"
gitVersion string = "v0.21.2-dev" // version from git, output of $(git describe)
gitMajor string = "1" // major version, always numeric
gitMinor string = "0.0+" // minor version, numeric possibly followed by "+"
gitVersion string = "v1.0.0-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"
)