From 7dc7c5e9ed6c622680a05f51dca0570d546620fa Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Thu, 20 Sep 2018 11:09:53 -0700 Subject: [PATCH 1/2] Update mailmap Fix ordering for Xuean Yan Signed-off-by: Derek McGowan --- .mailmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 315d78b4d..e5704350b 100644 --- a/.mailmap +++ b/.mailmap @@ -22,4 +22,4 @@ Xiaodong Zhang nashasha1 Jian Liao liaoj Jian Liao liaojian Rui Cao ruicao -Yan Xuean yanxuean +Xuean Yan yanxuean From 65e0214895d9d788d005230a9012895037c7f34a Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 19 Sep 2018 14:44:05 -0700 Subject: [PATCH 2/2] Update version for v1.2.0-rc.0 Signed-off-by: Derek McGowan --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index a34595c7c..f361076ed 100644 --- a/version/version.go +++ b/version/version.go @@ -21,7 +21,7 @@ var ( Package = "github.com/containerd/containerd" // Version holds the complete version number. Filled in at linking time. - Version = "1.2.0-beta.2+unknown" + Version = "1.2.0-rc.0+unknown" // Revision is filled with the VCS (e.g. git) revision being used to build // the program at linking time.