Merge pull request #4768 from dmcgowan/prepare-1.4.2

dmcgowan · web-flow · commit b321d358e6ee · 2020-11-26T00:13:20.000-08:00
[release/1.4] Prepare 1.4.2 release
diff --git a/.mailmap b/.mailmap
@@ -12,6 +12,7 @@ Arnaud Porterie <icecrime@gmail.com>
 Arnaud Porterie <icecrime@gmail.com> <arnaud.porterie@docker.com>
 Bob Mader <swapdisk@users.noreply.github.com>
 Boris Popovschi <zyqsempai@mail.ru>
+Bowen Yan <loneybw@gmail.com>
 Brent Baude <bbaude@redhat.com>
 Cao Zhihao <caozhihao@163.com>
 Cao Zhihao <caozhihao@163.com> <caozhihao.xd@bytedance.com>
diff --git a/releases/v1.4.2.toml b/releases/v1.4.2.toml
@@ -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.4.1"
+
+pre_release = false
+
+preface = """\
+The second patch release for `containerd` 1.4 includes multiple minor fixes
+and updates.
+
+### Notable Updates
+
+* Fix bug limiting the number of layers by default [containerd/cri#1602](https://github.com/containerd/cri/pull/1602)
+* Fix selinux shared memory issue by relabeling /dev/shm [containerd/cri#1605](https://github.com/containerd/cri/pull/1605)
+* Fix unknown state preventing removal of containers [containerd/containerd#4656](https://github.com/containerd/containerd/pull/4656)
+* Fix nil pointer error when restoring checkpoint [containerd/containerd#4754](https://github.com/containerd/containerd/pull/4754)
+* Improve image pull performance when using HTTP 1.1 [containerd/containerd#4653](https://github.com/containerd/containerd/pull/4653)
+* Update default seccomp profile for pidfd [containerd/containerd#4730](https://github.com/containerd/containerd/pull/4730)
+* Update Go to 1.15
+
+### Windows
+* Fix integer overflow on Windows [containerd/containerd#4589](https://github.com/containerd/containerd/pull/4589)
+* Fix lcow snapshotter to read trailing tar data [containerd/containerd#4628](https://github.com/containerd/containerd/pull/4628)
+"""
+
+# notable prs to include in the release notes, 1234 is the pr number
+[notes]
+
+[breaking]
diff --git a/vendor.conf b/vendor.conf
@@ -57,7 +57,7 @@ gotest.tools/v3                                     v3.0.2
 github.com/cilium/ebpf                              1c8d4c9ef7759622653a1d319284a44652333b28
 
 # cri dependencies
-github.com/containerd/cri                           9e81bf566b91195c4cdd64ebeda839efb952ec3d # release/1.4
+github.com/containerd/cri                           adc0b6a578ed6f646bb24c1c639d65b70e14cccc # release/1.4
 github.com/davecgh/go-spew                          v1.1.1
 github.com/docker/docker                            4634ce647cf2ce2c6031129ccd109e557244986f
 github.com/docker/spdystream                        449fdfce4d962303d702fec724ef0ad181c92528
diff --git a/vendor/github.com/containerd/cri/pkg/server/events.go b/vendor/github.com/containerd/cri/pkg/server/events.go
diff --git a/version/version.go b/version/version.go
@@ -23,7 +23,7 @@ var (
 	Package = "github.com/containerd/containerd"
 
 	// Version holds the complete version number. Filled in at linking time.
-	Version = "1.4.1+unknown"
+	Version = "1.4.2+unknown"
 
 	// Revision is filled with the VCS (e.g. git) revision being used to build
 	// the program at linking time.

-Original file line number
+Diff line change
 Arnaud Porterie <[email protected]> <[email protected]>
 Bob Mader <[email protected]>
 Boris Popovschi <[email protected]>
 +Bowen Yan <[email protected]>
 Brent Baude <[email protected]>
 Cao Zhihao <[email protected]>
 Cao Zhihao <[email protected]> <[email protected]>