diff --git a/.mailmap b/.mailmap index aac1a4422015..a3125cda6a06 100644 --- a/.mailmap +++ b/.mailmap @@ -18,6 +18,7 @@ Arnaud Porterie Arnaud Porterie Bob Mader Boris Popovschi +bot <49699333+dependabot[bot]@users.noreply.github.com> Bowen Yan Brent Baude Cao Zhihao @@ -54,7 +55,8 @@ haoyun Harry Zhang Hu Shuai Hu Shuai -Iceber Gu +Iceber Gu +Iceber Gu Jaana Burcu Dogan Jess Valarezo Jess Valarezo @@ -177,3 +179,4 @@ Zhoulin Xie Zhoulin Xie <42261994+JoeWrightss@users.noreply.github.com> zounengren 张潇 +张钰 diff --git a/releases/v2.0.0-beta.toml b/releases/v2.0.0-beta.toml index 2a0d2a56075d..7f963e845579 100644 --- a/releases/v2.0.0-beta.toml +++ b/releases/v2.0.0-beta.toml @@ -33,3 +33,5 @@ See also the [Getting Started](https://github.com/containerd/containerd/blob/mai override_deps."github.com/containerd/log".previous = "cf9777876edf6a4aa230c739bc7eec5ab8349e9c" override_deps."github.com/containerd/plugin".previous = "497c49344a4b9894a7e26497420cb7fa817facba" +override_deps."github.com/containerd/platforms".previous = "f18f3c661f7de73d5569f61ff72d98dae1c1700a" +override_deps."github.com/containerd/errdefs".previous = "f18f3c661f7de73d5569f61ff72d98dae1c1700a" diff --git a/version/version.go b/version/version.go index 1ed753290f4c..3ef0bf431e9d 100644 --- a/version/version.go +++ b/version/version.go @@ -23,7 +23,7 @@ var ( Package = "github.com/containerd/containerd/v2" // Version holds the complete version number. Filled in at linking time. - Version = "2.0.0-beta.1+unknown" + Version = "2.0.0-beta.2+unknown" // Revision is filled with the VCS (e.g. git) revision being used to build // the program at linking time.