From 8f958195cdf690d07a1d18b84a3e45c70a514b4f Mon Sep 17 00:00:00 2001
From: Michael Shuler <mshuler@apache.org>
Date: Fri, 14 Feb 2020 18:49:22 -0600
Subject: [PATCH] Bump version to 3.11.7

---
 CHANGES.txt      |  6 ++++++
 NEWS.txt         | 14 ++++++++++----
 build.xml        |  2 +-
 debian/changelog |  6 ++++++
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e50cb299a2..32220a2f34 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+3.11.7
+ * 
+
+
 3.11.6
  * Fix bad UDT sstable metadata serialization headers written by C* 3.0 on upgrade and in sstablescrub (CASSANDRA-15035)
  * Fix nodetool compactionstats showing extra pending task for TWCS - patch implemented (CASSANDRA-15409)
@@ -27,6 +31,8 @@ Merged from 2.2:
  * In-JVM DTest: Set correct internode message version for upgrade test (CASSANDRA-15371)
  * In-JVM DTest: Support NodeTool in dtest (CASSANDRA-15429)
  * Fix NativeLibrary.tryOpenDirectory callers for Windows (CASSANDRA-15426)
+
+
 3.11.5
  * Fix SASI non-literal string comparisons (range operators) (CASSANDRA-15169)
  * Make sure user defined compaction transactions are always closed (CASSANDRA-15123)
diff --git a/NEWS.txt b/NEWS.txt
index 3b6c13b9a9..077bd8bd4d 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -42,6 +42,14 @@ restore snapshots created with the previous major version using the
 'sstableloader' tool. You can upgrade the file format of your snapshots
 using the provided 'sstableupgrade' tool.
 
+3.11.7
+======
+
+Upgrading
+---------
+    - Nothing specific to this release, but please see previous upgrading sections,
+      especially if you are upgrading from 3.0.
+
 3.11.6
 ======
 
@@ -65,10 +73,8 @@ Upgrading
       in the serialzation-header to frozen UDTs, if that matches the schema, and continue with scrub.
       See `sstablescrub -h`.
       (CASSANDRA-15035)
-	- repair_session_max_tree_depth setting has been added to cassandra.yaml to allow operators to reduce
-	  merkle tree size if repair is creating too much heap pressure. See CASSANDRA-14096 for details.
-    - Nothing specific to this release, but please see previous upgrading sections,
-      especially if you are upgrading from 3.0.
+    - repair_session_max_tree_depth setting has been added to cassandra.yaml to allow operators to reduce
+      merkle tree size if repair is creating too much heap pressure. See CASSANDRA-14096 for details.
 
 3.11.5
 ======
diff --git a/build.xml b/build.xml
index 4e3e41f4a9..87595bf7f4 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="3.11.6"/>
+    <property name="base.version" value="3.11.7"/>
     <property name="scm.connection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
     <property name="scm.developerConnection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
     <property name="scm.url" value="https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/>
diff --git a/debian/changelog b/debian/changelog
index 0115a49b54..d7414c67e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (3.11.7) UNRELEASED; urgency=medium
+
+  * New release
+
+ -- Michael Shuler <mshuler@apache.org>  Fri, 14 Feb 2020 18:48:42 -0600
+
 cassandra (3.11.6) unstable; urgency=medium
 
   * New release