Merge pull request #9426 from brendandburns/release-0.18

Cut release 0.18.2 with the fix for Docker + memory limits
This commit is contained in:
Brendan Burns 2015-06-08 13:40:07 -07:00
commit cfcc6553a5

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