From ae42f836f467ee7699f8f2808b3ac5c6125b0c58 Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcg.dev>
Date: Wed, 1 Mar 2023 16:44:16 -0800
Subject: [PATCH 1/2] Update mailmap

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

diff --git a/.mailmap b/.mailmap
index 53b5919f8..8999a7a25 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,6 +2,7 @@ Abhinandan Prativadi <abhi@docker.com>
 Abhinandan Prativadi <abhi@docker.com> <aprativadi@gmail.com>
 Ace-Tang <aceapril@126.com>
 Adam Korcz <adam@adalogics.com> <Adam@adalogics.com>
+Aditi Sharma <adi.sky17@gmail.com> <sharmaad@vmware.com>
 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>
@@ -32,7 +33,8 @@ Eric Lin <linxiulei@gmail.com> <exlin@google.com>
 Eric Ren <renzhen.rz@linux.alibaba.com> <renzhen@linux.alibaba.com>
 Eric Ren <renzhen.rz@linux.alibaba.com> <renzhen.rz@alibaba-linux.com>
 Eric Ren <renzhen.rz@linux.alibaba.com> <renzhen.rz@alibaba-inc.com>
-Fabian Hoffman <extern.fabian.hoffmann@cariad.technology>
+Fabian Hoffmann <extern.fabian.hoffmann@cariad.technology>
+Fabian Hoffmann <extern.fabian.hoffmann@cariad.technology> <35104465+FabHof@users.noreply.github.com>
 Fabiano Fidêncio <fidencio@redhat.com> <fabiano.fidencio@intel.com>
 Fahed Dorgaa <fahed.dorgaa@gmail.com>
 Frank Yang <yyb196@gmail.com>
@@ -133,6 +135,8 @@ Su Xiaolin <linxxnil@126.com>
 Takumasa Sakao <sakataku7@gmail.com> <tsakao@zlab.co.jp>
 Ted Yu <yuzhihong@gmail.com>
 Tõnis Tiigi <tonistiigi@gmail.com>
+Tony Fang <nenghui.fang@gmail.com>
+Tony Fang <nenghui.fang@gmail.com> <nhfang@amazon.com>
 Wade Lee <weidonglee27@gmail.com>
 Wade Lee <weidonglee27@gmail.com> <weidonglee29@gmail.com>
 Wade Lee <weidonglee27@gmail.com> <21621232@zju.edu.cn>

From cd84f752c786d3b40915a118b2ad310115cfda77 Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcg.dev>
Date: Wed, 1 Mar 2023 16:04:42 -0800
Subject: [PATCH 2/2] Prepare release notes for v1.7.0-rc.1

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

diff --git a/releases/v1.7.0-rc.toml b/releases/v1.7.0-rc.toml
index 0b72319a3..fb94e14f6 100644
--- a/releases/v1.7.0-rc.toml
+++ b/releases/v1.7.0-rc.toml
@@ -87,9 +87,9 @@ Services are being refactored to allow ttrpc implementations, which can be serve
 * **Remove all gogoproto extensions** ([#6829](https://github.com/containerd/containerd/pull/6829))
 * **Migrate off from github.com/gogo/protobuf** ([#6841](https://github.com/containerd/containerd/pull/6841))
 * **ttrpc streaming** ([ttrpc#107](https://github.com/containerd/ttrpc/pull/107))
-
 * **Add unpack interface for client** ([#6749](https://github.com/containerd/containerd/pull/6749))
 * **Add collectible resources to metadata gc** ([#6804](https://github.com/containerd/containerd/pull/6804))
+* **Add version to shim protocol** ([#8177](https://github.com/containerd/containerd/pull/8177))
 
 ##### Configuration
 
diff --git a/version/version.go b/version/version.go
index f945c04ef..e10232d29 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-rc.0+unknown"
+	Version = "1.7.0-rc.1+unknown"
 
 	// Revision is filled with the VCS (e.g. git) revision being used to build
 	// the program at linking time.