From 6be2eccd720813758d4d7ad19037869bc698fd57 Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcg.dev>
Date: Fri, 14 Aug 2020 14:37:54 -0700
Subject: [PATCH 1/2] Update releases page for v1.4.0

Signed-off-by: Derek McGowan <derek@mcg.dev>
---
 RELEASES.md | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/RELEASES.md b/RELEASES.md
index 06f0b6983..c75d9fef2 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -93,14 +93,15 @@ The current state is available in the following table:
 
 | Release | Status      | Start            | End of Life       |
 |---------|-------------|------------------|-------------------|
-| [0.0](https://github.com/containerd/containerd/releases/tag/0.0.5)  | End of Life | Dec 4, 2015  | - |
-| [0.1](https://github.com/containerd/containerd/releases/tag/v0.1.0) | End of Life | Mar 21, 2016 | - |
-| [0.2](https://github.com/containerd/containerd/tree/v0.2.x)         | End of Life | Apr 21, 2016      | December 5, 2017 |
-| [1.0](https://github.com/containerd/containerd/releases/tag/v1.0.3) | End of Life | December 5, 2017  | December 5, 2018 |
-| [1.1](https://github.com/containerd/containerd/releases/tag/v1.1.8) | End of Life | April 23, 2018  | October 23, 2019 |
+| [0.0](https://github.com/containerd/containerd/releases/tag/0.0.5)   | End of Life | Dec 4, 2015  | - |
+| [0.1](https://github.com/containerd/containerd/releases/tag/v0.1.0)  | End of Life | Mar 21, 2016 | - |
+| [0.2](https://github.com/containerd/containerd/tree/v0.2.x)          | End of Life | Apr 21, 2016      | December 5, 2017 |
+| [1.0](https://github.com/containerd/containerd/releases/tag/v1.0.3)  | End of Life | December 5, 2017  | December 5, 2018 |
+| [1.1](https://github.com/containerd/containerd/releases/tag/v1.1.8)  | End of Life | April 23, 2018  | October 23, 2019 |
 | [1.2](https://github.com/containerd/containerd/releases/tag/v1.2.13) | Extended   | October 24, 2018 | September 26, 2020 |
-| [1.3](https://github.com/containerd/containerd/releases/tag/v1.3.3)  | Active   | September 26, 2019  | max(September 26, 2020, release of 1.4.0 + 6 months) |
-| [1.4](https://github.com/containerd/containerd/milestone/27)        | Next   | TBD  | max(TBD+1 year, release of 1.5.0 + 6 months) |
+| [1.3](https://github.com/containerd/containerd/releases/tag/v1.3.7)  | Active   | September 26, 2019  | February 17, 2021 |
+| [1.4](https://github.com/containerd/containerd/releases/tag/v1.4.0)  | Active   | August 17, 2020 | max(August 17, 2021, release of 1.5.0 + 6 months) |
+| [1.5](https://github.com/containerd/containerd/milestone/30)         | Next   | TBD  | max(TBD+1 year, release of 1.6.0 + 6 months) |
 
 Note that branches and release from before 1.0 may not follow these rules.
 

From d68ddb0c0ae8c539ae264047dbf5e3e08caac217 Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcg.dev>
Date: Fri, 14 Aug 2020 11:19:46 -0700
Subject: [PATCH 2/2] Prepare v1.4.0

Update release notes form rc to GA.
Update mailmap
Update version

Signed-off-by: Derek McGowan <derek@mcg.dev>
---
 .mailmap                                 | 4 ++++
 releases/{v1.4.0-rc.toml => v1.4.0.toml} | 2 +-
 version/version.go                       | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
 rename releases/{v1.4.0-rc.toml => v1.4.0.toml} (99%)

diff --git a/.mailmap b/.mailmap
index 274bcc584..10e9a96e0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -21,6 +21,7 @@ Cristian Staretu <cristian.staretu@gmail.com> <unclejack@users.noreply.github.co
 Daniel Dao <dqminh89@gmail.com>
 Derek McGowan <derek@mcg.dev> <derek@mcgstyle.net>
 Edgar Lee <edgarl@netflix.com> <edgar.lee@docker.com>
+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>
@@ -63,6 +64,7 @@ Lu Jingxiao <lujingxiao@huawei.com>
 Maksym Pavlenko <makpav@amazon.com> <pavlenko.maksym@gmail.com>
 Mario Hros <spam@k3a.me>
 Mario Hros <spam@k3a.me> <root@k3a.me>
+Mario Macias <mariomac@gmail.com> <mmacias@newrelic.com>
 Mark Gordon <msg555@gmail.com>
 Michael Crosby <crosbymichael@gmail.com> <michael@thepasture.io>
 Michael Katsoulis <michaelkatsoulis88@gmail.com>
@@ -77,7 +79,9 @@ Rui Cao <ruicao@alauda.io> <ruicao@alauda.io>
 Sakeven Jiang <jc5930@sina.cn>
 Seth Pellegrino <spellegrino@newrelic.com> <30441101+sethp-nr@users.noreply.github.com>
 Shengbo Song <thomassong@tencent.com>
+Shengjing Zhu <i@zhsj.me> <zhsj@debian.org>
 SiYu Zhao <d.chaser.zsy@gmail.com>
+Stefan Berger <stefanb@us.ibm.com> <stefanb@linux.vnet.ibm.com>
 Stephen J Day <stevvooe@gmail.com> <stephen.day@getcruise.com>
 Stephen J Day <stevvooe@gmail.com> <stevvooe@users.noreply.github.com>
 Stephen J Day <stevvooe@gmail.com> <stephen.day@docker.com>
diff --git a/releases/v1.4.0-rc.toml b/releases/v1.4.0.toml
similarity index 99%
rename from releases/v1.4.0-rc.toml
rename to releases/v1.4.0.toml
index bd3e49724..382497853 100644
--- a/releases/v1.4.0-rc.toml
+++ b/releases/v1.4.0.toml
@@ -8,7 +8,7 @@ match_deps = "^github.com/(containerd/[a-zA-Z0-9-]+)$"
 # previous release
 previous = "v1.3.0"
 
-pre_release = true
+pre_release = false
 
 preface = """\
 The fifth major release of containerd includes a mix of new features and
diff --git a/version/version.go b/version/version.go
index 75b6b018c..3eb8c902b 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.4.0-rc.1+unknown"
+	Version = "1.4.0+unknown"
 
 	// Revision is filled with the VCS (e.g. git) revision being used to build
 	// the program at linking time.