You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2020/05/06 11:01:14 UTC

[cassandra] 01/01: Merge branch 'cassandra-2.2' into cassandra-3.0

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 196e54436fdf6487f3f2380ce45e053dd431df3b
Merge: 0fd9b5b c6a9f55
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Wed May 6 12:52:50 2020 +0200

    Merge branch 'cassandra-2.2' into cassandra-3.0

 CHANGES.txt | 1 +
 build.xml   | 1 +
 2 files changed, 2 insertions(+)

diff --cc CHANGES.txt
index c495cd6,00507d2..6e6f418
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 -2.2.18
 +3.0.21
 + * Fix Debian init start/stop (CASSANDRA-15770)
 + * Fix infinite loop on index query paging in tables with clustering (CASSANDRA-14242)
 + * Fix chunk index overflow due to large sstable with small chunk length (CASSANDRA-15595)
 + * cqlsh return non-zero status when STDIN CQL fails (CASSANDRA-15623)
 + * Don't skip sstables in slice queries based only on local min/max/deletion timestamp (CASSANDRA-15690)
 + * Memtable memory allocations may deadlock (CASSANDRA-15367)
 + * Run evictFromMembership in GossipStage (CASSANDRA-15592)
 +Merged from 2.2:
+  * Remove duplicated tools binaries from tarballs (CASSANDRA-15768)
   * Duplicate results with DISTINCT queries in mixed mode (CASSANDRA-15501)
   * Disable JMX rebinding (CASSANDRA-15653)
  Merged from 2.1:


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org