diff --git a/CHANGES.txt b/CHANGES.txt index 050767a943..dc7f81eec7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,9 @@ +4.2 +Merged from 4.0: +Merged from 3.11: +Merged from 3.0: + + 4.1 * Add auto_snapshot_ttl configuration (CASSANDRA-16790) * List snapshots of dropped tables (CASSANDRA-16843) diff --git a/NEWS.txt b/NEWS.txt index 1280d02379..5695e16f4b 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -51,6 +51,20 @@ 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.2 +=== + +New features +------------ + +Upgrading +--------- + +Deprecation +----------- + + 4.1 === diff --git a/build.xml b/build.xml index 343f7e87a0..d0466578ac 100644 --- a/build.xml +++ b/build.xml @@ -33,7 +33,7 @@ - + diff --git a/debian/changelog b/debian/changelog index 53ea788890..b2397e52fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -cassandra (4.1) UNRELEASED; urgency=medium +cassandra (4.2) UNRELEASED; urgency=medium * New release