From 61612e1a2cd63feea45b533ca29524018edbc320 Mon Sep 17 00:00:00 2001 From: Daniel Canter Date: Fri, 29 Jul 2022 12:30:44 -0700 Subject: [PATCH 1/2] Prepare release notes for 1.6.7 Signed-off-by: Daniel Canter --- releases/v1.6.7.toml | 28 ++++++++++++++++++++++++++++ version/version.go | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 releases/v1.6.7.toml diff --git a/releases/v1.6.7.toml b/releases/v1.6.7.toml new file mode 100644 index 000000000000..a1801852b69c --- /dev/null +++ b/releases/v1.6.7.toml @@ -0,0 +1,28 @@ +# commit to be tagged for new release +commit = "HEAD" + +project_name = "containerd" +github_repo = "containerd/containerd" +match_deps = "^github.com/(containerd/[a-zA-Z0-9-]+)$" + +# previous release +previous = "v1.6.6" + +pre_release = false + +preface = """\ +The seventh patch release for containerd 1.6 contains various fixes, +includes a new version of runc and adds support for ppc64le and riscv64 +(requires unreleased runc 1.2) builds. + +### Notable Updates + +* **Update runc to v1.1.3** ([#7036](https://github.com/containerd/containerd/pull/7036)) +* **Seccomp: Allow clock_settime64 with CAP_SYS_TIME** ([#7172](https://github.com/containerd/containerd/pull/7172)) +* **Fix WWW-Authenticate parsing** ([#7131](https://github.com/containerd/containerd/pull/7131)) +* **Support RISC-V 64 and ppc64le builds** ([#7170](https://github.com/containerd/containerd/pull/7170)) +* **Windows: Update hcsshim to v0.9.4 to fix regression with HostProcess stats** ([#7200](https://github.com/containerd/containerd/pull/7200)) +* **Windows: Fix shim logs going to panic.log file** ([#7242](https://github.com/containerd/containerd/pull/7242)) +* **Allow ptrace(2) by default for kernels >= 4.8** ([#7171](https://github.com/containerd/containerd/pull/7171)) + +See the changelog for complete list of changes""" diff --git a/version/version.go b/version/version.go index cef635bb9bf3..6cefa536a894 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.6.6+unknown" + Version = "1.6.7+unknown" // Revision is filled with the VCS (e.g. git) revision being used to build // the program at linking time. From 6a854d4b59761698134a89080fe005243af4c0ec Mon Sep 17 00:00:00 2001 From: Daniel Canter Date: Fri, 29 Jul 2022 12:31:28 -0700 Subject: [PATCH 2/2] Update mailmap Signed-off-by: Daniel Canter --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index faf769cc1269..bbef6770f85c 100644 --- a/.mailmap +++ b/.mailmap @@ -83,6 +83,7 @@ Mario Hros Mario Hros Mario Macias Mark Gordon +Marvin Giessing Michael Crosby Michael Katsoulis Mike Brown