Merge pull request #2666 from dmcgowan/update-version-1.2-rc.0

dmcgowan · web-flow · commit 99fc40fd6088 · 2018-09-20T13:30:58.000-07:00
Update version for v1.2.0-rc.0
diff --git a/.mailmap b/.mailmap
@@ -22,4 +22,4 @@ Xiaodong Zhang <a4012017@sina.com> nashasha1 <a4012017@sina.com>
 Jian Liao <jliao@alauda.io> liaoj <jliao@alauda.io>
 Jian Liao <jliao@alauda.io> liaojian <liaojian@Dabllo.local>
 Rui Cao <ruicao@alauda.io> ruicao <ruicao@alauda.io>
-Yan Xuean <yan.xuean@zte.com.cn> yanxuean <yan.xuean@zte.com.cn>
+Xuean Yan <yan.xuean@zte.com.cn> yanxuean <yan.xuean@zte.com.cn>
diff --git 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.

-Original file line number
+Diff line change
 Jian Liao <[email protected]> liaoj <[email protected]>
 Jian Liao <[email protected]> liaojian <[email protected]>
 Rui Cao <[email protected]> ruicao <[email protected]>
 -Yan Xuean <[email protected]> yanxuean <[email protected]>
 +Xuean Yan <[email protected]> yanxuean <[email protected]>