This is an automated email from the ASF dual-hosted git repository.
marcuse pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 4772b664839937dc5db7d9fcbc54e0112fe27ee0
Merge: cf10df0 f0aa60b
Author: Marcus Eriksson <marc...@apache.org>
AuthorDate: Mon Nov 11 10:53:39 2019 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/LegacyLayout.java | 27 ++++++++++++---
.../cassandra/distributed/upgrade/UpgradeTest.java | 38 ++++++++++++++++++++++
3 files changed, 62 insertions(+), 4 deletions(-)
diff --cc CHANGES.txt
index 38134a4,547bb1a..6781c4e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
-3.0.20
+3.11.6
+Merged from 3.0:
+ * Avoid over-trimming of results in mixed mode clusters (CASSANDRA-15405)
* validate value sizes in LegacyLayout (CASSANDRA-15373)
* Ensure that tracing doesn't break connections in 3.x/4.0 mixed mode by
default (CASSANDRA-15385)
* Make sure index summary redistribution does not start when compactions are
paused (CASSANDRA-15265)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
