Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge release 0.14.1 to master #6323

Merged
merged 6 commits into from
Apr 2, 2015
Merged

Merge release 0.14.1 to master #6323

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dedd4b0
Remove pods from the assumed pod list when they are deleted
lavalamp Mar 27, 2015
eb4568b
update instructions to make it clear to get review
eparis Mar 30, 2015
06c1fe4
Instructions to back-merge release branches into master
eparis Mar 30, 2015
77775a6
Kubernetes version v0.14.1
zmerlynn Apr 1, 2015
22aac51
Kubernetes version v0.14.1-dev
zmerlynn Apr 1, 2015
e9c7b35
Merge branch 'release-0.14' into merge-release-0.14-to-master
zmerlynn Apr 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/version/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)