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:16 UTC
[cassandra] branch trunk updated (0273250 -> 0b8c5f7)
This is an automated email from the ASF dual-hosted git repository.
mck pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 0273250 Merge branch 'cassandra-3.11' into trunk
new 97eae44 Multiget Thrift query returns null records after digest mismatch
new c08ce93 Merge branch 'cassandra-3.0' into cassandra-3.11
new 0b8c5f7 Merge branch 'cassandra-3.11' into trunk
The 3 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.11' into trunk
Posted by mc...@apache.org.
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
commit 0b8c5f70a229bbaaa5e934dc2fc61acada773cb0
Merge: 0273250 c08ce93
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Tue Jul 2 12:09:35 2019 +0200
Merge branch 'cassandra-3.11' into trunk
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 de8d648,0d0b759..2faca24
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -366,6 -3,8 +366,7 @@@
* 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)
* Update token metadata when handling MOVING/REMOVING_TOKEN events (CASSANDRA-15120)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org