diff --git a/.mailmap b/.mailmap index 8999a7a25..87221c9af 100644 --- a/.mailmap +++ b/.mailmap @@ -67,6 +67,7 @@ Junyu Liu LongtaoZhang Lorenz Brun Luc Perkins +James Sturtevant Jiajun Jiang Julien Balestra Jun Lin Chen <1913688+mc256@users.noreply.github.com> diff --git a/releases/v1.7.0-rc.toml b/releases/v1.7.0-rc.toml index fb94e14f6..065a11f9a 100644 --- a/releases/v1.7.0-rc.toml +++ b/releases/v1.7.0-rc.toml @@ -14,7 +14,7 @@ preface = """\ The eighth major release of containerd includes new functionality alongside many improvements. This release is intended to be the last major release of containerd 1.x before 2.0. Some functionality in this release may be considered experimental or unstable, but will become stable or default in 2.0. -This release still adheres to our backwards compability guarantees and users who do not use or enable new functionality should use this release with the same stability expectations. +This release still adheres to our backwards compatibility guarantees and users who do not use or enable new functionality should use this release with the same stability expectations. The previous 1.6 release has also become a long term stable release for users who prefer releases with mostly stability improvements and wish to wait a few releases for new functionality. ### Highlights @@ -110,6 +110,7 @@ The 2.0 release will remove any feature deprecated in 1.x. Features deprecated i * **Add experimental support for runtime specific snapshotters** ([#6899](https://github.com/containerd/containerd/pull/6899)) * **Pass all TOML runtime configuration options from CRI to the runtime** ([#7764](https://github.com/containerd/containerd/pull/7764)) * **Support for user namespaces in stateless pods ([KEP-127](https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/127-user-namespaces)) _(experimental)_** ([#7679](https://github.com/containerd/containerd/pull/7679)) +* **Add timeout option for drain exec io** ([#7832](https://github.com/containerd/containerd/pull/7832)) * **Add network plugin metrics** ([#7858](https://github.com/containerd/containerd/pull/7858)) * **CRI v1alpha2 is deprecated and will be removed from containerd in containerd v2.0; if you are using the CRI API please move up to CRI v1; Kubernetes supports CRI v1 since Kubernetes 1.23** ([#7863](https://github.com/containerd/containerd/pull/7863)) diff --git a/version/version.go b/version/version.go index e10232d29..7e081ae27 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.7.0-rc.1+unknown" + Version = "1.7.0-rc.2+unknown" // Revision is filled with the VCS (e.g. git) revision being used to build // the program at linking time.