This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4effa4efbe ninja-fix CHANGES.txt remove merge sections
4effa4efbe is described below
commit 4effa4efbe456d2f5335ef4b6db39804eab21042
Author: Mick Semb Wever <[email protected]>
AuthorDate: Sun Apr 2 10:25:03 2023 +0200
ninja-fix CHANGES.txt remove merge sections
In trunk there should be no "Merge from…" sections. Forward merged change
should go under the previous major section's latest unreleased version (and
nothing under the trunk version). When the first trunk release happens
(typically at branch time) it is presumed (and understood) that all changes
from previous releases as found in the same CHANGES.txt file are included.
---
CHANGES.txt | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 374ecc709a..5c8a04819f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -124,11 +124,6 @@
* Add new CQL function maxWritetime (CASSANDRA-17425)
* Add guardrail for ALTER TABLE ADD / DROP / REMOVE column operations
(CASSANDRA-17495)
* Rename DisableFlag class to EnableFlag on guardrails (CASSANDRA-17544)
-Merged from 4.1:
-Merged from 4.0:
-Merged from 3.11:
-Merged from 3.0:
- * Save host id to system.local and flush immediately after startup
(CASSANDRA-18153)
4.1.2
* Return snapshots with dots in their name in nodetool listsnapshots
(CASSANDRA-18371)
@@ -136,6 +131,10 @@ Merged from 3.0:
* Do not submit hints when hinted_handoff_enabled=false (CASSANDRA-18304)
* Fix COPY ... TO STDOUT behavior in cqlsh (CASSANDRA-18353)
* Remove six and Py2SaferScanner merge cruft (CASSANDRA-18354)
+Merged from 4.0:
+Merged from 3.11:
+Merged from 3.0:
+ * Save host id to system.local and flush immediately after startup
(CASSANDRA-18153)
4.1.1
* Deprecate org.apache.cassandra.hadoop code (CASSANDRA-16984)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
