Update release notes and mailmap

dmcgowan · dmcgowan · commit bc8fdf8324f2 · 2021-09-28T19:26:58.000-07:00
Signed-off-by: Derek McGowan &lt;derek@mcg.dev&gt;
diff --git a/.mailmap b/.mailmap
@@ -108,6 +108,7 @@ Tõnis Tiigi <tonistiigi@gmail.com>
 Wade Lee <weidonglee27@gmail.com>
 Wade Lee <weidonglee27@gmail.com> <weidonglee29@gmail.com>
 Wade Lee <weidonglee27@gmail.com> <21621232@zju.edu.cn>
+wanglei <wllenyj@linux.alibaba.com>
 Wei Fu <fuweid89@gmail.com>
 Wei Fu <fuweid89@gmail.com> <fhfuwei@163.com>
 Xiaodong Zhang <a4012017@sina.com>
diff --git a/releases/v1.5.6.toml b/releases/v1.5.6.toml
@@ -11,13 +11,16 @@ previous = "v1.5.5"
 pre_release = false
 
 preface = """\
-The sixth patch release for containerd 1.5 updates runc to 1.0.2, seccomp to 2.5.1, and contains various other fixes.
+The sixth patch release for containerd 1.5 contains minor fixes and updates
+including an updated runc and hcsshim.
 
 ### Notable Updates
 
-* **Update runc binary to 1.0.2** [#5983](https://github.com/containerd/containerd/pull/5983)
-* **Update hcsshim to v0.8.21 which contains a fix in the Windows shim for layer issues on Windows Server 2019** [#5942](https://github.com/containerd/containerd/pull/5942)
 * **Install apparmor parser for arm64 and update seccomp to 2.5.1** [#5763](https://github.com/containerd/containerd/pull/5763)
-* **Add support for 'clone3' syscall to fix issues with certain images when seccomp is enabled** [#6013](https://github.com/containerd/containerd/pull/6013)
+* **Update runc binary to 1.0.2** [#5899](https://github.com/containerd/containerd/pull/5899)
+* **Update hcsshim to v0.8.21 to fix layer issue on Windows Server 2019** [#5942](https://github.com/containerd/containerd/pull/5942)
+* **Add support for 'clone3' syscall to fix issue with certain images when seccomp is enabled** [#5982](https://github.com/containerd/containerd/pull/5982)
+* **Add image config labels in CRI container creation** [#6012](https://github.com/containerd/containerd/pull/6012)
+* **Fix panic in metadata content writer on copy error** [#6043](https://github.com/containerd/containerd/pull/6043)
 
 See the changelog for complete list of changes"""

-Original file line number
+Diff line change
 Wade Lee <[email protected]>
 Wade Lee <[email protected]> <[email protected]>
 Wade Lee <[email protected]> <[email protected]>
 +wanglei <[email protected]>
 Wei Fu <[email protected]>
 Wei Fu <[email protected]> <[email protected]>
 Xiaodong Zhang <[email protected]>