From 34b7a5f094610b335bdfb91dccd2385b00816671 Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcg.dev>
Date: Mon, 15 Mar 2021 16:14:12 -0700
Subject: [PATCH 1/2] Update mailmap

Signed-off-by: Derek McGowan <derek@mcg.dev>
---
 .mailmap | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index ab42e0088..64965ecaa 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,6 +5,7 @@ Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> <suda.akihiro@lab.ntt.co.jp>
 Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> <suda.kyoto@gmail.com>
 Allen Sun <shlallen1990@gmail.com> <allensun@AllenSundeMacBook-Pro.local>
 Alexander Morozov <lk4d4math@gmail.com> <lk4d4@docker.com>
+Antonio Ojea <antonio.ojea.garcia@gmail.com> <aojea@redhat.com>
 Amit Krishnan <krish.amit@gmail.com> <amit.krishnan@oracle.com>
 Andrei Vagin <avagin@virtuozzo.com> <avagin@openvz.org>
 Andrey Kolomentsev <andrey.kolomentsev@gmail.com>
@@ -36,6 +37,7 @@ Haiyan Meng <haiyanmeng@google.com>
 Harry Zhang <harryz@hyper.sh> <harryzhang@zju.edu.cn>
 Hu Shuai <hus.fnst@cn.fujitsu.com>
 Hu Shuai <hus.fnst@cn.fujitsu.com> <hushuaiia@qq.com>
+Iceber Gu <wei.cai-nat@daocloud.io>
 Jaana Burcu Dogan <burcujdogan@gmail.com> <jbd@golang.org>
 Jess Valarezo <valarezo.jessica@gmail.com>
 Jess Valarezo <valarezo.jessica@gmail.com> <jessica.valarezo@docker.com>
@@ -47,6 +49,7 @@ John Howard <github@lowenna.com>
 John Howard <github@lowenna.com> <john.howard@microsoft.com>
 John Howard <github@lowenna.com> <jhoward@microsoft.com>
 John Howard <github@lowenna.com> <jhowardmsft@users.noreply.github.com>
+Lorenz Brun <lorenz@brun.one> <lorenz@nexantic.com>
 Luc Perkins <lucperkins@gmail.com>
 Julien Balestra <julien.balestra@datadoghq.com>
 Jun Lin Chen <webmaster@mc256.com> <1913688+mc256@users.noreply.github.com>
@@ -63,7 +66,8 @@ Lantao Liu <lantaol@google.com> <taotaotheripper@gmail.com>
 Li Yuxuan <liyuxuan04@baidu.com> <darfux@163.com>
 Lifubang <lifubang@aliyun.com> <lifubang@acmcoder.com>
 Lu Jingxiao <lujingxiao@huawei.com>
-Maksym Pavlenko <makpav@amazon.com> <pavlenko.maksym@gmail.com>
+Maksym Pavlenko <pavlenko.maksym@gmail.com> <makpav@amazon.com>
+Maksym Pavlenko <pavlenko.maksym@gmail.com> <mxpv@apple.com>
 Mario Hros <spam@k3a.me>
 Mario Hros <spam@k3a.me> <root@k3a.me>
 Mario Macias <mariomac@gmail.com> <mmacias@newrelic.com>
@@ -84,9 +88,12 @@ Rui Cao <ruicao@alauda.io> <ruicao@alauda.io>
 Sakeven Jiang <jc5930@sina.cn>
 Samuel Karp <me@samuelkarp.com> <skarp@amazon.com>
 Seth Pellegrino <spellegrino@newrelic.com> <30441101+sethp-nr@users.noreply.github.com>
+Shaobao Feng <shaobao.feng@huawei.com>
 Shengbo Song <thomassong@tencent.com>
 Shengjing Zhu <i@zhsj.me> <zhsj@debian.org>
+Siddharth Yadav <sedflix@gmail.com>
 SiYu Zhao <d.chaser.zsy@gmail.com>
+Stefan Berger <stefanb@us.ibm.com> <stefanb@linux.ibm.com>
 Stefan Berger <stefanb@us.ibm.com> <stefanb@linux.vnet.ibm.com>
 Stephen J Day <stevvooe@gmail.com> <stephen.day@getcruise.com>
 Stephen J Day <stevvooe@gmail.com> <stevvooe@users.noreply.github.com>
@@ -97,7 +104,9 @@ Su Xiaolin <linxxnil@126.com>
 Ted Yu <yuzhihong@gmail.com>
 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>
+Wei Fu <fuweid89@gmail.com>
 Wei Fu <fuweid89@gmail.com> <fhfuwei@163.com>
 Xiaodong Zhang <a4012017@sina.com>
 Xuean Yan <yan.xuean@zte.com.cn>

From e6086d9c07c6f73298d051a391b0fbd80ea58e98 Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcg.dev>
Date: Mon, 15 Mar 2021 15:53:52 -0700
Subject: [PATCH 2/2] Prepare release notes for v1.5.0-beta.4

Signed-off-by: Derek McGowan <derek@mcg.dev>
---
 releases/v1.5.0-beta.toml | 2 ++
 version/version.go        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/releases/v1.5.0-beta.toml b/releases/v1.5.0-beta.toml
index 5f5e7d637..6159715a5 100644
--- a/releases/v1.5.0-beta.toml
+++ b/releases/v1.5.0-beta.toml
@@ -35,6 +35,7 @@ brings support for the Node Resource Interface (NRI).
 * **Pass custom snapshot labels when creating snapshot** [#4630](https://github.com/containerd/containerd/pull/4630) [#4635](https://github.com/containerd/containerd/pull/4635)
 * **Add platform check for snapshotter support when unpacking** [#3927](https://github.com/containerd/containerd/pull/3927)
 * **Handle loopback mounts** [#4902](https://github.com/containerd/containerd/pull/4902)
+* **Support `userxattr` mount option for overlay in user namespace** [#5076](https://github.com/containerd/containerd/pull/5076)
 
 #### Distribution
 * **Improve registry response errors** [#4523](https://github.com/containerd/containerd/pull/4523)
@@ -51,6 +52,7 @@ brings support for the Node Resource Interface (NRI).
 * **Optimize LCOW snapshotter use of scratch layers** [#4643](https://github.com/containerd/containerd/pull/4643)
 
 #### CRI
+* **Add support for registry host directory configuration** [#4978](https://github.com/containerd/containerd/pull/4978)
 * **Update privileged containers to use current capabilities instead of known capabilities** [#5017](https://github.com/containerd/containerd/pull/5017)
 * **Add pod annotations to CNI call** [#5026](https://github.com/containerd/containerd/pull/5026)
 
diff --git a/version/version.go b/version/version.go
index 35cca5a51..21a5647ee 100644
--- 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.5.0-beta.3+unknown"
+	Version = "1.5.0-beta.4+unknown"
 
 	// Revision is filled with the VCS (e.g. git) revision being used to build
 	// the program at linking time.