diff --git a/.mailmap b/.mailmap index 10e9a96e0..44558a388 100644 --- a/.mailmap +++ b/.mailmap @@ -12,6 +12,7 @@ Arnaud Porterie Arnaud Porterie Bob Mader Boris Popovschi +Bowen Yan Brent Baude Cao Zhihao Cao Zhihao @@ -48,6 +49,7 @@ John Howard John Howard Luc Perkins Julien Balestra +Jun Lin Chen <1913688+mc256@users.noreply.github.com> Justin Cormack Justin Terry Justin Terry @@ -69,10 +71,12 @@ Mark Gordon Michael Crosby Michael Katsoulis Mike Brown +Mohammad Asif Siddiqui Nishchay Kumar Oliver Stenbom Phil Estes Reid Li +Robin Winkelewski Ross Boucher Ruediger Maass Rui Cao @@ -87,8 +91,11 @@ Stephen J Day Stephen J Day Sudeesh John Su Fei +Su Xiaolin Ted Yu Tõnis Tiigi +Wade Lee +Wade Lee <21621232@zju.edu.cn> Wei Fu Xiaodong Zhang Xuean Yan @@ -96,6 +103,7 @@ Yue Zhang Yuxing Liu Zhang Wei Zhenguang Zhu +Zhiyu Li Zhiyu Li <404977848@qq.com> Zhongming Chang Zhoulin Xie diff --git a/releases/v1.5.0-beta.toml b/releases/v1.5.0-beta.toml index 30126929e..f13b8b1e0 100644 --- a/releases/v1.5.0-beta.toml +++ b/releases/v1.5.0-beta.toml @@ -39,6 +39,7 @@ brings support for the Node Resource Interface (NRI). * **Improve image pull performance over HTTP 1.1** [#4653](https://github.com/containerd/containerd/pull/4653) * **Registry configuration package** [#4138](https://github.com/containerd/containerd/pull/4138) * **Add support for layers compressed with zstd** [#4809](https://github.com/containerd/containerd/pull/4809) +* **Allow arm64 to fallback to arm (v8, v7, v6, v5)** [4932](https://github.com/containerd/containerd/pull/4932) ## Runtime * **Add annotations to containerd task update API** [#4647](https://github.com/containerd/containerd/pull/4647) diff --git a/version/version.go b/version/version.go index 6acde4f7a..6900391c7 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.0+unknown" + Version = "1.5.0-beta.1+unknown" // Revision is filled with the VCS (e.g. git) revision being used to build // the program at linking time.