diff --git a/.mailmap b/.mailmap index 35a896745..b592de76b 100644 --- a/.mailmap +++ b/.mailmap @@ -29,11 +29,13 @@ Eric Ernst Eric Ren Eric Ren Eric Ren +Fabiano Fidêncio Fahed Dorgaa Frank Yang Fupan Li Fupan Li Fupan Li +Furkan Türkal Georgia Panoutsakopoulou Guangming Wang Haiyan Meng @@ -55,11 +57,13 @@ John Howard John Howard Lorenz Brun Luc Perkins +Jiajun Jiang Julien Balestra Jun Lin Chen <1913688+mc256@users.noreply.github.com> Justin Cormack Justin Terry Justin Terry +Kante Kenfe-Mickaël Laventure Kevin Kern Kevin Parsons @@ -84,6 +88,7 @@ Michael Katsoulis Mike Brown Mohammad Asif Siddiqui Ng Yang +ningmingxiao Nishchay Kumar Oliver Stenbom Phil Estes @@ -109,6 +114,7 @@ Stephen J Day Sudeesh John Su Fei Su Xiaolin +Takumasa Sakao Ted Yu Tõnis Tiigi Wade Lee 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.