Skip to content

K
k3s
Commit a80cbe60 authored by Zach Loafman's avatar Zach Loafman
Browse files
Options

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

Merge release 0.20.2 to master
parents f754b8e1 63913da7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/version/base.go
View file @ a80cbe60
...@@ -36,8 +36,8 @@ package version ...@@ -36,8 +36,8 @@ package version
var ( var (
// TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead. // TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead.
gitMajor string = "0" // major version, always numeric gitMajor string = "0" // major version, always numeric
gitMinor string = "20.0+" // minor version, numeric possibly followed by "+" gitMinor string = "20.2+" // minor version, numeric possibly followed by "+"
gitVersion string = "v0.20.0-dev" // version from git, output of $(git describe) gitVersion string = "v0.20.2-dev" // version from git, output of $(git describe)
gitCommit string = "" // sha1 from git, output of $(git rev-parse HEAD) 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" gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty"
) )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment