commit 9ad08f1c951ae8b5ee0387306f450afaccf4eaba
author William Hesse <whesse@google.com> Tue Jun 21 11:05:10 2022 +0200
committer William Hesse <whesse@google.com> Tue Jun 21 11:05:10 2022 +0200
tree e4197ff08916eb1426d61f7300116e9abeb08547
parent c6b0453443b6908fc6ce4e30d2eceb47628d717e
parent 1f8ce8b566f7804992a8f310e168174b060fe3c7

Version 2.17.5

* Cherry-pick refs/changes/89/249189/1 to stable

CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0699684..c146e53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-## 2.17.4 - 2022-06-20
+## 2.17.5 - 2022-06-22
 
 This is a patch release that fixes:
 

tools/VERSION

diff --git a/tools/VERSION b/tools/VERSION
index f9aa7cc..7e91410 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -26,6 +26,6 @@
 CHANNEL stable
 MAJOR 2
 MINOR 17
-PATCH 4
+PATCH 5
 PRERELEASE 0
 PRERELEASE_PATCH 0
\ No newline at end of file