Skip to content

Commit

Permalink
Merge pull request containerd#2917 from dmcgowan/release-1.2.2
Browse files Browse the repository at this point in the history
[release/1.2] 1.2.2 release
  • Loading branch information
dmcgowan authored Jan 8, 2019
2 parents 4bb2b0c + ef63704 commit 9754871
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 1 deletion.
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ Jian Liao <[email protected]> liaoj <[email protected]>
Jian Liao <[email protected]> liaojian <[email protected]>
Rui Cao <[email protected]> ruicao <[email protected]>
Xuean Yan <[email protected]> yanxuean <[email protected]>
Mike Brown <[email protected]> Mike Brown <[email protected]>
35 changes: 35 additions & 0 deletions releases/v1.2.2.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# commit to be tagged for new release
commit = "HEAD"

project_name = "containerd"
github_repo = "containerd/containerd"
match_deps = "^github.com/(containerd/[a-zA-Z0-9-]+)$"

# previous release
previous = "v1.2.1"

pre_release = false

preface = """\
The second patch release for `containerd` 1.2 includes important
runtime and CRI fixes.
## Runtime
* Fix rare deadlock on FIFO creation with timeout
## CRI
**ACTION REQUIRED:**
For Kubernetes support, when upgrading containerd from 1.2.0 (including rc releases)
to 1.2.1+, a node reboot is recommended to avoid a known deadlock in 1.2.0.
See [containerd/cri#1018](https://github.com/containerd/cri/issues/1018)
* Fix a bug that a container can't be stopped or inspected when its corresponding image is deleted
* Fix a bug that the cri plugin handles containerd events outside of `k8s.io` namespace"""

# notable prs to include in the release notes, 1234 is the pr number
[notes]

[breaking]

[rename_deps]
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var (
Package = "github.com/containerd/containerd"

// Version holds the complete version number. Filled in at linking time.
Version = "1.2.1+unknown"
Version = "1.2.2+unknown"

// Revision is filled with the VCS (e.g. git) revision being used to build
// the program at linking time.
Expand Down

0 comments on commit 9754871

Please sign in to comment.