diff --git a/.mailmap b/.mailmap index 44558a388..ab42e0088 100644 --- a/.mailmap +++ b/.mailmap @@ -75,12 +75,14 @@ Mohammad Asif Siddiqui Nishchay Kumar Oliver Stenbom Phil Estes +Phil Estes Reid Li Robin Winkelewski Ross Boucher Ruediger Maass Rui Cao Sakeven Jiang +Samuel Karp Seth Pellegrino <30441101+sethp-nr@users.noreply.github.com> Shengbo Song Shengjing Zhu diff --git a/releases/v1.5.0-beta.toml b/releases/v1.5.0-beta.toml index f13b8b1e0..bbfc1e06a 100644 --- a/releases/v1.5.0-beta.toml +++ b/releases/v1.5.0-beta.toml @@ -48,6 +48,10 @@ brings support for the Node Resource Interface (NRI). ## Windows * **Optimize LCOW snapshotter use of scratch layers** [#4643](https://github.com/containerd/containerd/pull/4643) +## CRI +* **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) + And many more improvements and bug fixes in the complete changelog""" # notable prs to include in the release notes, 1234 is the pr number diff --git a/version/version.go b/version/version.go index 6900391c7..08d01778d 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.1+unknown" + Version = "1.5.0-beta.2+unknown" // Revision is filled with the VCS (e.g. git) revision being used to build // the program at linking time.