From d2b57fe463ebb6a0921f5c6efa87efd5f36263c5 Mon Sep 17 00:00:00 2001
From: Mick Semb Wever <mck@apache.org>
Date: Sat, 1 May 2021 12:13:59 +0200
Subject: [PATCH] Create release branch cassandra-4.0, increment trunk version
 to 4.1

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

diff --git a/CHANGES.txt b/CHANGES.txt
index c4f4d09eef..ba2769e1a8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,9 @@
+4.1
+Merged from 4.0:
+Merged from 3.11:
+Merged from 3.0:
+
+
 4.0-rc2
  * Fix race in fat client removal (CASSANDRA-16238)
  * Test org.apache.cassandra.net.AsyncPromiseTest FAILED (CASSANDRA-16596)
diff --git a/NEWS.txt b/NEWS.txt
index a35c4c5310..6f7fcf6495 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -33,6 +33,18 @@ 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.
 
+4.1
+===
+
+New features
+------------
+
+Upgrading
+---------
+
+Deprecation
+-----------
+
 4.0
 ===
 
diff --git a/build.xml b/build.xml
index 0e5291b918..6f1c87bd80 100644
--- a/build.xml
+++ b/build.xml
@@ -24,7 +24,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information -->
-    <property name="base.version" value="4.0-rc2"/>
+    <property name="base.version" value="4.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 b19e982dda..53ea788890 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cassandra (4.0~rc2) UNRELEASED; urgency=medium
+cassandra (4.1) UNRELEASED; urgency=medium
 
   * New release