Merge branch 'release-0.14' into merge-release-0.14-to-master

This commit is contained in:
Zach Loafman 2015-04-01 16:15:26 -07:00
commit e9c7b35896

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