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 <[email protected]>
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: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to