From 971a5935ed68e07a1e7e309cfcb4c39bfa87be8b Mon Sep 17 00:00:00 2001
From: Adam Cozzette <acozzette@google.com>
Date: Wed, 10 Mar 2021 10:21:18 -0800
Subject: [PATCH] Updated CHANGES.txt and PHP changelog for 3.15.6

---
 CHANGES.txt                         | 5 +++++
 php/ext/google/protobuf/package.xml | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 8e77f6abeb10..e59d44b31494 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+2021-03-10 version 3.15.6 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
+
+  Ruby
+  * Fixed bug in string comparison logic (#8386)
+
 2021-03-04 version 3.15.5 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
 
   Ruby
diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml
index 4d322769f7aa..c00f6fba0a1b 100644
--- a/php/ext/google/protobuf/package.xml
+++ b/php/ext/google/protobuf/package.xml
@@ -22,8 +22,7 @@
  </stability>
  <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
  <notes>
- New changes in 3.15.5:
- * Fixed quadratic memory use in array append (#8379)
+ No new changes in 3.15.6
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">