Prepare v1.4.0

Update release notes form rc to GA. Update mailmap Update version Signed-off-by: Derek McGowan <[email protected]>
zhuangqh · Aug 17, 2020 · d68ddb0 · d68ddb0
1 parent 6be2ecc
commit d68ddb0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.mailmap b/.mailmap
@@ -21,6 +21,7 @@ Cristian Staretu <[email protected]> <[email protected]
 Daniel Dao <[email protected]>
 Derek McGowan <[email protected]> <[email protected]>
 Edgar Lee <[email protected]> <[email protected]>
+Eric Ernst <[email protected]> <[email protected]>
 Eric Ren <[email protected]> <[email protected]>
 Eric Ren <[email protected]> <[email protected]>
 Eric Ren <[email protected]> <[email protected]>
@@ -63,6 +64,7 @@ Lu Jingxiao <[email protected]>
 Maksym Pavlenko <[email protected]> <[email protected]>
 Mario Hros <[email protected]>
 Mario Hros <[email protected]> <[email protected]>
+Mario Macias <[email protected]> <[email protected]>
 Mark Gordon <[email protected]>
 Michael Crosby <[email protected]> <[email protected]>
 Michael Katsoulis <[email protected]>
@@ -77,7 +79,9 @@ Rui Cao <[email protected]> <[email protected]>
 Sakeven Jiang <[email protected]>
 Seth Pellegrino <[email protected]> <[email protected]>
 Shengbo Song <[email protected]>
+Shengjing Zhu <[email protected]> <[email protected]>
 SiYu Zhao <[email protected]>
+Stefan Berger <[email protected]> <[email protected]>
 Stephen J Day <[email protected]> <[email protected]>
 Stephen J Day <[email protected]> <[email protected]>
 Stephen J Day <[email protected]> <[email protected]>

diff --git a/releases/v1.4.0-rc.toml → releases/v1.4.0.toml b/releases/v1.4.0-rc.toml → 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
@@ -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.