Merge pull request #3562 from dmcgowan/update-release-1.3

crosbymichael · web-flow · commit e96329045858 · 2019-08-22T10:57:28.000-04:00
Update 1.3 release notes and mailmap
diff --git a/.mailmap b/.mailmap
@@ -9,6 +9,7 @@ Carlos Eduardo <me@carlosedp.com> CarlosEDP <me@carlosedp.com>
 Eric Ren <renzhen.rz@alibaba-linux.com> renzhen.rz <renzhen.rz@alibaba-inc.com>
 Frank Yang <yyb196@gmail.com> frank yang <yyb196@gmail.com>
 Georgia Panoutsakopoulou <gpanoutsak@gmail.com> gpanouts <gpanoutsak@gmail.com>
+Guangming Wang <guangming.wang@daocloud.io> ethan <guangming.wang@daocloud.io>
 Haiyan Meng <haiyanmeng@google.com> haiyanmeng <haiyanmeng@google.com>
 Jian Liao <jliao@alauda.io> liaojian <liaojian@Dabllo.local>
 Jian Liao <jliao@alauda.io> liaoj <jliao@alauda.io>
diff --git a/releases/v1.3.0-rc.toml b/releases/v1.3.0-rc.toml
@@ -21,8 +21,9 @@ API. For clients, there are many new features and improvements completely
 implemented in the client libraries without requiring daemon upgrade.
 
 ### Runtime
-* **New Windows V2 runtime using [hcsshim](https://github.com/microsoft/hcsshim/tree/master/cmd/containerd-shim-runhcs-v1)**
+* **New Windows V2 runtime using shim API.** Adds support for the Windows runtime shims in containerd. *NOTE: while containerd's runtime is stable in this release, running Windows containers are not yet fully supported until the [runhcs shim](https://github.com/microsoft/hcsshim/tree/master/cmd/containerd-shim-runhcs-v1) is fully supported.*
 * **Improvements to ttrpc.** For better daemon to shim communication (https://github.com/containerd/containerd/pull/3341)
+* **Removed experimental Windows V1 runtime**
 
 ### Snapshots
 * **New Devmapper snapshotter** (https://github.com/containerd/containerd/pull/3022)

-Original file line number
+Diff line change
 Eric Ren <[email protected]> renzhen.rz <[email protected]>
 Frank Yang <[email protected]> frank yang <[email protected]>
 Georgia Panoutsakopoulou <[email protected]> gpanouts <[email protected]>
 +Guangming Wang <[email protected]> ethan <[email protected]>
 Haiyan Meng <[email protected]> haiyanmeng <[email protected]>
 Jian Liao <[email protected]> liaojian <[email protected]>
 Jian Liao <[email protected]> liaoj <[email protected]>