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 2019/07/02 10:19:14 UTC
[cassandra] branch cassandra-3.11 updated (83baa27 -> c08ce93)
This is an automated email from the ASF dual-hosted git repository.
mck pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 83baa27 Merge branch 'cassandra-3.0' into cassandra-3.11
new 97eae44 Multiget Thrift query returns null records after digest mismatch
new c08ce93 Merge branch 'cassandra-3.0' into cassandra-3.11
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/filter/DataLimits.java | 6 ++++++
src/java/org/apache/cassandra/db/partitions/PartitionIterators.java | 6 ++++--
src/java/org/apache/cassandra/db/transform/BasePartitions.java | 4 ++--
4 files changed, 13 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
Posted by mc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c08ce93cb1ba8ad9e023ecc5676b427259bf3256
Merge: 83baa27 97eae44
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Tue Jul 2 12:05:23 2019 +0200
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/filter/DataLimits.java | 6 ++++++
src/java/org/apache/cassandra/db/partitions/PartitionIterators.java | 6 ++++--
src/java/org/apache/cassandra/db/transform/BasePartitions.java | 4 ++--
4 files changed, 13 insertions(+), 4 deletions(-)
diff --cc CHANGES.txt
index e433f7d,c891ce2..0d0b759
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
-3.0.19
+3.11.5
+ * Fix cassandra-env.sh to use $CASSANDRA_CONF to find cassandra-jaas.config (CASSANDRA-14305)
+ * Fixed nodetool cfstats printing index name twice (CASSANDRA-14903)
+ * Add flag to disable SASI indexes, and warnings on creation (CASSANDRA-14866)
+Merged from 3.0:
+ * Multiget thrift query returns null records after digest mismatch (CASSANDRA-14812)
* Skipping illegal legacy cells can break reverse iteration of indexed partitions (CASSANDRA-15178)
* Handle paging states serialized with a different version than the session's (CASSANDRA-15176)
* Throw IOE instead of asserting on unsupporter peer versions (CASSANDRA-15066)
diff --cc src/java/org/apache/cassandra/db/partitions/PartitionIterators.java
index 70759cf,a3cf746..f88cf76
--- a/src/java/org/apache/cassandra/db/partitions/PartitionIterators.java
+++ b/src/java/org/apache/cassandra/db/partitions/PartitionIterators.java
@@@ -18,8 -18,10 +18,9 @@@
package org.apache.cassandra.db.partitions;
import java.util.*;
-import java.security.MessageDigest;
import org.apache.cassandra.db.EmptyIterators;
+ import org.apache.cassandra.db.transform.FilteredPartitions;
import org.apache.cassandra.db.transform.MorePartitions;
import org.apache.cassandra.db.transform.Transformation;
import org.apache.cassandra.utils.AbstractIterator;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org