From ebdb88248ccd515cf6c9d47d8c3d2c815afca808 Mon Sep 17 00:00:00 2001 From: Ivan Valdes Date: Fri, 8 Mar 2024 13:38:44 -0800 Subject: [PATCH 1/2] changelog: remove line from compiling with go 1.21.6 Signed-off-by: Ivan Valdes --- CHANGELOG/CHANGELOG-3.4.md | 1 - CHANGELOG/CHANGELOG-3.5.md | 1 - 2 files changed, 2 deletions(-) diff --git a/CHANGELOG/CHANGELOG-3.4.md b/CHANGELOG/CHANGELOG-3.4.md index 8135ee10a..429532101 100644 --- a/CHANGELOG/CHANGELOG-3.4.md +++ b/CHANGELOG/CHANGELOG-3.4.md @@ -14,7 +14,6 @@ Previous change logs can be found at [CHANGELOG-3.3](https://github.com/etcd-io/ - Add [client backoff and retry config options](https://github.com/etcd-io/etcd/pull/17369). ### Dependencies -- Compile binaries using [go 1.21.6](https://github.com/etcd-io/etcd/pull/17368). - Upgrade [bbolt to 1.3.9](https://github.com/etcd-io/etcd/pull/17484). - Compile binaries using [go 1.21.8](https://github.com/etcd-io/etcd/pull/17538). diff --git a/CHANGELOG/CHANGELOG-3.5.md b/CHANGELOG/CHANGELOG-3.5.md index 97908a52b..55c9b5224 100644 --- a/CHANGELOG/CHANGELOG-3.5.md +++ b/CHANGELOG/CHANGELOG-3.5.md @@ -21,7 +21,6 @@ Previous change logs can be found at [CHANGELOG-3.4](https://github.com/etcd-io/ - `--permit-without-stream` ### Dependencies -- Compile binaries using [go 1.21.6](https://github.com/etcd-io/etcd/pull/17362). - Upgrade [bbolt to v1.3.9](https://github.com/etcd-io/etcd/pull/17483). - Compile binaries using [go 1.21.8](https://github.com/etcd-io/etcd/pull/17537). From a9cfdfd88b0537b6e438a0f998c7494693a5bb90 Mon Sep 17 00:00:00 2001 From: Ivan Valdes Date: Fri, 8 Mar 2024 13:40:23 -0800 Subject: [PATCH 2/2] changelog: add google.golang.org/protobuf bump to v1.33.0 Signed-off-by: Ivan Valdes --- CHANGELOG/CHANGELOG-3.4.md | 1 + CHANGELOG/CHANGELOG-3.5.md | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG/CHANGELOG-3.4.md b/CHANGELOG/CHANGELOG-3.4.md index 429532101..76d556b43 100644 --- a/CHANGELOG/CHANGELOG-3.4.md +++ b/CHANGELOG/CHANGELOG-3.4.md @@ -16,6 +16,7 @@ Previous change logs can be found at [CHANGELOG-3.3](https://github.com/etcd-io/ ### Dependencies - Upgrade [bbolt to 1.3.9](https://github.com/etcd-io/etcd/pull/17484). - Compile binaries using [go 1.21.8](https://github.com/etcd-io/etcd/pull/17538). +- Upgrade [google.golang.org/protobuf to v1.33.0 to address CVE-2024-24786](https://github.com/etcd-io/etcd/pull/17554). ### Others - [Make CGO_ENABLED configurable](https://github.com/etcd-io/etcd/pull/17422). diff --git a/CHANGELOG/CHANGELOG-3.5.md b/CHANGELOG/CHANGELOG-3.5.md index 55c9b5224..b5136e9cb 100644 --- a/CHANGELOG/CHANGELOG-3.5.md +++ b/CHANGELOG/CHANGELOG-3.5.md @@ -23,6 +23,7 @@ Previous change logs can be found at [CHANGELOG-3.4](https://github.com/etcd-io/ ### Dependencies - Upgrade [bbolt to v1.3.9](https://github.com/etcd-io/etcd/pull/17483). - Compile binaries using [go 1.21.8](https://github.com/etcd-io/etcd/pull/17537). +- Upgrade [google.golang.org/protobuf to v1.33.0 to address CVE-2024-24786](https://github.com/etcd-io/etcd/pull/17553). ### Others - [Make CGO_ENABLED configurable](https://github.com/etcd-io/etcd/pull/17421).