From 532be9274b39ff033d93d170209dede9db4fa074 Mon Sep 17 00:00:00 2001
From: Cameron Zemek <cameron@instaclustr.com>
Date: Fri, 23 Oct 2020 11:55:41 +1000
Subject: [PATCH] Cassandra 3.11.6.1 release

---
 CHANGES.txt      | 4 ++++
 build.xml        | 2 +-
 debian/changelog | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index e50cb299a232..c9eb8b577852 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+3.11.6.1
+ * Reject empty options and invalid DC names in replication configuration while creating or altering a keyspace (CASSANDRA-12681)
+ * Wait for schema agreement rather than in flight schema requests when bootstrapping (CASSANDRA-15158)
+
 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)
diff --git a/build.xml b/build.xml
index 4e3e41f4a953..7893c1fd7ad0 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.6.1"/>
     <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 0115a49b542b..6ea57e8879db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (3.11.6.1) unstable; urgency=medium
+
+ * New release
+
+ -- Cameron Zemek <cameron@instaclustr.com> Fri, 23 Oct 2020 10:50:00 +1000
+
 cassandra (3.11.6) unstable; urgency=medium
 
   * New release