Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/554d6beb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/554d6beb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/554d6beb Branch: refs/heads/trunk Commit: 554d6beb0920cba9bcc0124fa9f33c580012b761 Parents: da41476 cc16ff1 Author: Stefania Alborghetti <[email protected]> Authored: Fri Dec 23 09:42:01 2016 +0800 Committer: Stefania Alborghetti <[email protected]> Committed: Fri Dec 23 09:42:01 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/ReadCommand.java | 40 ++++++++++++-------- .../db/SinglePartitionReadCommand.java | 4 +- .../apache/cassandra/db/filter/RowFilter.java | 11 +++++- .../db/RepairedDataTombstonesTest.java | 8 ++-- 5 files changed, 42 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/554d6beb/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/554d6beb/src/java/org/apache/cassandra/db/ReadCommand.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/554d6beb/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/554d6beb/src/java/org/apache/cassandra/db/filter/RowFilter.java ----------------------------------------------------------------------
