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 c08baf2  ninja-fix CHANGES.txt so >4.0.0 entries are "Merged in …" 
entries
c08baf2 is described below

commit c08baf20c67cb16eeac00f2bcb23dd87384e7701
Author: Mick Semb Wever <[email protected]>
AuthorDate: Sat Feb 19 00:07:39 2022 +0100

    ninja-fix CHANGES.txt so >4.0.0 entries are "Merged in …" entries
---
 CHANGES.txt | 56 +++++++++++++++++++++++---------------------------------
 1 file changed, 23 insertions(+), 33 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 25a472b..9bbb57e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -90,17 +90,10 @@
  * Add a system property to set hostId if not yet initialized (CASSANDRA-14582)
  * GossiperTest.testHasVersion3Nodes didn't take into account trunk version 
changes, fixed to rely on latest version (CASSANDRA-16651)
  * Update JNA library to 5.9.0 and snappy-java to version 1.1.8.4 
(CASSANDRA-17040)
-Merged from 3.0:
- * Fixed TestCqlshOutput failing tests (CASSANDRA-17386)
- * Lazy transaction log replica creation allows incorrect replica content 
divergence during anticompaction (CASSANDRA-17273)
- * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272)
-
-4.0.3
+Merged from 4.0:
  * Deprecate otc_coalescing_strategy, otc_coalescing_window_us, 
otc_coalescing_enough_coalesced_messages,
    otc_backlog_expiration_interval_ms (CASSANDRA-17377)
  * Improve start up processing of Incremental Repair information read from 
system.repairs (CASSANDRA-17342)
-
-4.0.2
  * Extend operator control over the UDF threading model for CVE-2021-44521 
(CASSANDRA-17352)
  * Full Java 11 support (CASSANDRA-16894)
  * Remove unused 'geomet' package from cqlsh path (CASSANDRA-17271)
@@ -129,11 +122,33 @@ Merged from 3.0:
  * org.apache.cassandra.db.rows.ArrayCell#unsharedHeapSizeExcludingData 
includes data twice (CASSANDRA-16900)
  * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898)
  * Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies 
(CASSANDRA-16854)
+ * Tolerate missing DNS entry when completing a host replacement 
(CASSANDRA-16873)
+ * Harden PrunableArrayQueue against Pruner implementations that might throw 
exceptions (CASSANDRA-16866)
+ * Move RepairedDataInfo to the execution controller rather than the 
ReadCommand to avoid unintended sharing (CASSANDRA-16721)
+ * Bump zstd-jni version to 1.5.0-4 (CASSANDRA-16884)
+ * Remove assumption that all urgent messages are small (CASSANDRA-16877)
+ * ArrayClustering.unsharedHeapSize does not include the data so undercounts 
the heap size (CASSANDRA-16845)
+ * Improve help, doc and error messages about sstabledump -k and -x arguments 
(CASSANDRA-16818)
+ * Add repaired/unrepaired bytes back to nodetool (CASSANDRA-15282)
+ * Upgrade lz4-java to 1.8.0 to add RH6 support back (CASSANDRA-16753)
+ * Improve DiagnosticEventService.publish(event) logging message of events 
(CASSANDRA-16749)
+ * Cleanup dependency scopes (CASSANDRA-16704)
+ * Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues() 
thread-safe (CASSANDRA-16707)
 Merged from 3.11:
  * Add key validation to ssstablescrub (CASSANDRA-16969)
  * Update Jackson from 2.9.10 to 2.12.5 (CASSANDRA-16851)
  * Make assassinate more resilient to missing tokens (CASSANDRA-16847)
+ * Validate SASI tokenizer options before adding index to schema 
(CASSANDRA-15135)
+ * Fixup scrub output when no data post-scrub and clear up old use of row, 
which really means partition (CASSANDRA-16835)
+ * Reduce thread contention in CommitLogSegment and HintsBuffer 
(CASSANDRA-16072)
+ * Make cqlsh use the same set of reserved keywords than the server uses 
(CASSANDRA-15663)
+ * Optimize bytes skipping when reading SSTable files (CASSANDRA-14415)
+ * Enable tombstone compactions when unchecked_tombstone_compaction is set in 
TWCS (CASSANDRA-14496)
+ * Read only the required SSTables for single partition queries 
(CASSANDRA-16737)
 Merged from 3.0:
+ * Fixed TestCqlshOutput failing tests (CASSANDRA-17386)
+ * Lazy transaction log replica creation allows incorrect replica content 
divergence during anticompaction (CASSANDRA-17273)
+ * LeveledCompactionStrategy disk space check improvements (CASSANDRA-17272)
  * Fix conversion from megabits to bytes in streaming rate limiter 
(CASSANDRA-17243)
  * Upgrade logback to 1.2.9 (CASSANDRA-17204)
  * Avoid race in AbstractReplicationStrategy endpoint caching (CASSANDRA-16673)
@@ -154,29 +169,6 @@ Merged from 3.0:
  * Catch UnsatisfiedLinkError in WindowsTimer (CASSANDRA-16085)
  * Avoid removing batch when it's not created during view replication 
(CASSANDRA-16175)
  * Make the addition of regular column to COMPACT tables throw an 
InvalidRequestException (CASSANDRA-14564)
-
-4.0.1
- * Tolerate missing DNS entry when completing a host replacement 
(CASSANDRA-16873)
- * Harden PrunableArrayQueue against Pruner implementations that might throw 
exceptions (CASSANDRA-16866)
- * Move RepairedDataInfo to the execution controller rather than the 
ReadCommand to avoid unintended sharing (CASSANDRA-16721)
- * Bump zstd-jni version to 1.5.0-4 (CASSANDRA-16884)
- * Remove assumption that all urgent messages are small (CASSANDRA-16877)
- * ArrayClustering.unsharedHeapSize does not include the data so undercounts 
the heap size (CASSANDRA-16845)
- * Improve help, doc and error messages about sstabledump -k and -x arguments 
(CASSANDRA-16818)
- * Add repaired/unrepaired bytes back to nodetool (CASSANDRA-15282)
- * Upgrade lz4-java to 1.8.0 to add RH6 support back (CASSANDRA-16753)
- * Improve DiagnosticEventService.publish(event) logging message of events 
(CASSANDRA-16749)
- * Cleanup dependency scopes (CASSANDRA-16704)
- * Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues() 
thread-safe (CASSANDRA-16707)
-Merged from 3.11:
- * Validate SASI tokenizer options before adding index to schema 
(CASSANDRA-15135)
- * Fixup scrub output when no data post-scrub and clear up old use of row, 
which really means partition (CASSANDRA-16835)
- * Reduce thread contention in CommitLogSegment and HintsBuffer 
(CASSANDRA-16072)
- * Make cqlsh use the same set of reserved keywords than the server uses 
(CASSANDRA-15663)
- * Optimize bytes skipping when reading SSTable files (CASSANDRA-14415)
- * Enable tombstone compactions when unchecked_tombstone_compaction is set in 
TWCS (CASSANDRA-14496)
- * Read only the required SSTables for single partition queries 
(CASSANDRA-16737)
-Merged from 3.0:
  * Make the addition of regular column to COMPACT tables throw an 
InvalidRequestException (CASSANDRA-14564)
  * Fix secondary indexes on primary key columns skipping some writes 
(CASSANDRA-16868)
  * Use JMX to validate nodetool --jobs parameter (CASSANDRA-16104)
@@ -198,8 +190,6 @@ Merged from 3.0:
  * Fix fwd to/from headers in DC write forwarding (CASSANDRA-16797)
  * Fix CassandraVersion::compareTo (CASSANDRA-16794)
  * BinLog does not close chronicle queue leaving this to GC to cleanup 
(CASSANDRA-16774)
-Merged from 3.11:
-Merged from 3.0:
 
 4.0-rc2
  * Improved password obfuscation (CASSANDRA-16801)

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to