From d82cb5703d489888ab3660c30f50f3e859e4f045 Mon Sep 17 00:00:00 2001
From: Mick Semb Wever <mck@apache.org>
Date: Thu, 25 Aug 2022 17:49:58 +0200
Subject: [PATCH] Increment version to 4.0.7

---
 CHANGES.txt      | 9 ++++++---
 build.xml        | 2 +-
 debian/changelog | 6 ++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 67a78a0a7e..c18d9a6a4f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,10 @@
-4.0.6
+4.0.7
  * Prevent infinite loop in repair coordinator on FailSession (CASSANDRA-17834)
+Merged from 3.11:
+ * Fix potential IndexOutOfBoundsException in PagingState in mixed mode clusters (CASSANDRA-17840)
+Merged from 3.0:
+
+4.0.6
  * Fix race condition on updating cdc size and advancing to next segment (CASSANDRA-17792)
  * Add 'noboolean' rpm build for older distros like CentOS7 (CASSANDRA-17765)
  * Fix default value for compaction_throughput_mb_per_sec in Config class to match  the one in cassandra.yaml (CASSANDRA-17790)
@@ -10,7 +15,6 @@
  * Clean up ScheduledExecutors, CommitLog, and MessagingService shutdown for in-JVM dtests (CASSANDRA-17731)
  * Remove extra write to system table for prepared statements (CASSANDRA-17764)
 Merged from 3.11:
- * Fix potential IndexOutOfBoundsException in PagingState in mixed mode clusters (CASSANDRA-17840)
  * Document usage of closed token intervals in manual compaction (CASSANDRA-17575)
 Merged from 3.0:
  * Improve libjemalloc resolution in bin/cassandra (CASSANDRA-15767)
@@ -34,7 +38,6 @@ Merged from 3.0:
  * Suppress CVE-2022-24823 (CASSANDRA-17633)
  * fsync TOC and digest files (CASSANDRA-10709)
 
-
 4.0.4
  * Optimise BTree build,update and transform operations (CASSANDRA-15510)
  * Clean up schema migration coordinator and tests (CASSANDRA-17533)
diff --git a/build.xml b/build.xml
index 02da8ff8ff..0e152d2a85 100644
--- a/build.xml
+++ b/build.xml
@@ -33,7 +33,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="4.0.6"/>
+    <property name="base.version" value="4.0.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 e3aa6f71a9..441d0b0d33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (4.0.7) UNRELEASED; urgency=medium
+
+  * New release
+
+ -- Mick Semb Wever <mck@apache.org>  Thu, 18 Aug 2022 20:30:16 +0200
+
 cassandra (4.0.6) unstable; urgency=medium
 
   * New release