From a018ae3f6059aff93c8079f0a5ad17acdcc0f33c Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcg.dev>
Date: Sat, 8 Jan 2022 09:53:35 -0800
Subject: [PATCH] Prepare release notes for v1.6.0-rc.0

Signed-off-by: Derek McGowan <derek@mcg.dev>
---
 .mailmap                                      | 6 ++++++
 releases/{v1.6.0-beta.toml => v1.6.0-rc.toml} | 0
 version/version.go                            | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
 rename releases/{v1.6.0-beta.toml => v1.6.0-rc.toml} (100%)

diff --git a/.mailmap b/.mailmap
index 35a896745..b592de76b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -29,11 +29,13 @@ Eric Ernst <eric@amperecomputing.com> <eric.ernst@intel.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>
+Fabiano Fidêncio <fidencio@redhat.com> <fabiano.fidencio@intel.com>
 Fahed Dorgaa <fahed.dorgaa@gmail.com>
 Frank Yang <yyb196@gmail.com>
 Fupan Li <lifupan@gmail.com>
 Fupan Li <lifupan@gmail.com> <fupan.lfp@antfin.com>
 Fupan Li <lifupan@gmail.com> <fupan.lfp@antgroup.com>
+Furkan Türkal <furkan.turkal@trendyol.com>
 Georgia Panoutsakopoulou <gpanoutsak@gmail.com>
 Guangming Wang <guangming.wang@daocloud.io>
 Haiyan Meng <haiyanmeng@google.com>
@@ -55,11 +57,13 @@ John Howard <github@lowenna.com> <jhoward@microsoft.com>
 John Howard <github@lowenna.com> <jhowardmsft@users.noreply.github.com>
 Lorenz Brun <lorenz@brun.one> <lorenz@nexantic.com>
 Luc Perkins <lucperkins@gmail.com>
+Jiajun Jiang <levinxo@gmail.com>
 Julien Balestra <julien.balestra@datadoghq.com>
 Jun Lin Chen <webmaster@mc256.com> <1913688+mc256@users.noreply.github.com>
 Justin Cormack <justin.cormack@docker.com> <justin@specialbusservice.com>
 Justin Terry <juterry@microsoft.com>
 Justin Terry <juterry@microsoft.com> <jterry75@users.noreply.github.com>
+Kante <kerthcet@gmail.com>
 Kenfe-Mickaël Laventure <mickael.laventure@gmail.com>
 Kevin Kern <kaiwentan@harmonycloud.cn>
 Kevin Parsons <kevpar@microsoft.com> <kevpar@users.noreply.github.com>
@@ -84,6 +88,7 @@ Michael Katsoulis <michaelkatsoulis88@gmail.com>
 Mike Brown <brownwm@us.ibm.com> <mikebrow@users.noreply.github.com>
 Mohammad Asif Siddiqui <mohammad.asif.siddiqui1@huawei.com>
 Ng Yang <wssccc@qq.com>
+ningmingxiao <ning.mingxiao@zte.com.cn>
 Nishchay Kumar <mrawesomenix@gmail.com>
 Oliver Stenbom <oliver@stenbom.eu> <ostenbom@pivotal.io>
 Phil Estes <estesp@gmail.com> <estesp@linux.vnet.ibm.com>
@@ -109,6 +114,7 @@ Stephen J Day <stevvooe@gmail.com> <stephen.day@docker.com>
 Sudeesh John <sudeesh@linux.vnet.ibm.com>
 Su Fei  <fesu@ebay.com> <fesu@ebay.com>
 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>
 Wade Lee <weidonglee27@gmail.com>
diff --git a/releases/v1.6.0-beta.toml b/releases/v1.6.0-rc.toml
similarity index 100%
rename from releases/v1.6.0-beta.toml
rename to releases/v1.6.0-rc.toml
diff --git a/version/version.go b/version/version.go
index 17ada168f..63a4e46a6 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.6.0-beta.5+unknown"
+	Version = "1.6.0-rc.0+unknown"
 
 	// Revision is filled with the VCS (e.g. git) revision being used to build
 	// the program at linking time.