From 33e706aec63410890aebc191852c4a1fdd22fb42 Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcg.dev>
Date: Fri, 9 Dec 2022 14:58:44 -0800
Subject: [PATCH] Prepare release notes for v1.7.0-beta.1

Signed-off-by: Derek McGowan <derek@mcg.dev>
---
 .mailmap                  |  2 ++
 releases/v1.7.0-beta.toml | 23 +++++++++++++++++++++--
 version/version.go        |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index 37becc943..dbdb84a0e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -58,6 +58,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>
+LongtaoZhang <DragonBillow@outlook.com>
 Lorenz Brun <lorenz@brun.one> <lorenz@nexantic.com>
 Luc Perkins <lucperkins@gmail.com>
 Jiajun Jiang <levinxo@gmail.com>
@@ -89,6 +90,7 @@ Mario Hros <spam@k3a.me> <root@k3a.me>
 Mario Macias <mariomac@gmail.com> <mmacias@newrelic.com>
 Mark Gordon <msg555@gmail.com>
 Marvin Giessing <marvin.giessing@gmail.com>
+Mathis Michel <mathis.michel@outlook.de>
 Michael Crosby <crosbymichael@gmail.com> <michael@thepasture.io>
 Michael Katsoulis <michaelkatsoulis88@gmail.com>
 Mike Brown <brownwm@us.ibm.com> <mikebrow@users.noreply.github.com>
diff --git a/releases/v1.7.0-beta.toml b/releases/v1.7.0-beta.toml
index f0792f892..09f2c8a8a 100644
--- a/releases/v1.7.0-beta.toml
+++ b/releases/v1.7.0-beta.toml
@@ -29,15 +29,28 @@ This API makes it easier to manage these groups of containers at a higher level
 * **Sandbox API** ([#6703](https://github.com/containerd/containerd/pull/6703))
 * **CRI Sandbox API Implementation** ([#7228](https://github.com/containerd/containerd/pull/7228))
 
-#### Transfer Service _(in progress)_
+#### Transfer Service _(experimental)_
 
 * **Transfer Service** ([#7320](https://github.com/containerd/containerd/pull/7320))
 
-#### NRI _(in progress)_
+The transfer service provides a simple interface to transfer artifact objects between any source and destination. This allows for
+pull and push operations to be done in containerd whether requested from clients or plugins. It is experimental in this release
+to allow for further plugin development and integration into existing plugins.
+
+See the [Transfer Docs](https://github.com/containerd/containerd/blob/main/docs/transfer.md)
+
+#### NRI _(experimental)_
 
 * **Extend NRI scope** ([nri#16](https://github.com/containerd/nri/pull/16))
 * **Support for updated NRI** ([#6019](https://github.com/containerd/containerd/pull/6019))
 
+The Node Resource Interface is a common framework for plugging extensions into OCI-compatible container runtimes. It provides
+basic mechanisms for plugins to track the state of containers and to make limited changes to their configuration.
+
+This release introduces NRI v0.2.0 with an updated plugin interface to cover a wide range of use cases.
+
+See the [NRI Docs](https://github.com/containerd/containerd/blob/main/docs/NRI.md)
+
 #### Platform Support
 
 * **Linux containers on FreeBSD** ([#7000](https://github.com/containerd/containerd/pull/7000))
@@ -86,11 +99,17 @@ The 2.0 release will remove any feature deprecated in 1.x. Features deprecated i
 
 * **Support image pull progress timeout** ([#6150](https://github.com/containerd/containerd/pull/6150))
 * **Fix CRI plugin to setup pod network after creating the sandbox container** ([#5904](https://github.com/containerd/containerd/pull/5904))
+* **Pass all TOML runtime configuration options from CRI to the runtime** ([#7764](https://github.com/containerd/containerd/pull/7764))
 
 #### Other
 
 * **Support shallow content copy by adding reader option to local content reader at** ([#7414](https://github.com/containerd/containerd/pull/7414))
 * **Add NoSameOwner option when unpacking tars** ([#7386](https://github.com/containerd/containerd/pull/7386))
+* **Add `FetcherByDigest` for fetching blobs without fetching a manifest** ([#7460](https://github.com/containerd/containerd/pull/7460))
+* **Update default seccomp profile to block socket calls to AF_VSOCK** ([#7510](https://github.com/containerd/containerd/pull/7510))
+* **Replace fork on mount logic with CLONE_FS** ([#7513](https://github.com/containerd/containerd/pull/7513))
+* **Add support for default registry host configuration** ([#7607](https://github.com/containerd/containerd/pull/7607))
+* **Use github.com/minio/sha256-simd for more efficient sha256 calculation** ([#7732](https://github.com/containerd/containerd/pull/7732))
 
 See the changelog for complete list of changes"""
 
diff --git a/version/version.go b/version/version.go
index 76daae6f0..14c784b3f 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.7.0-beta.0+unknown"
+	Version = "1.7.0-beta.1+unknown"
 
 	// Revision is filled with the VCS (e.g. git) revision being used to build
 	// the program at linking time.