Merge branch 'cassandra-3.9' into trunk

* cassandra-3.9:
  Don't ignore deletion info in sstable on reverse queries
  NPE when trying to remove purgable tombstones from result


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3016dc7c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3016dc7c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3016dc7c

Branch: refs/heads/trunk
Commit: 3016dc7c2f321c072dc11831be92a0331795ae89
Parents: 9fd6077 a006f57
Author: Sylvain Lebresne <[email protected]>
Authored: Thu Jul 7 13:02:53 2016 +0200
Committer: Sylvain Lebresne <[email protected]>
Committed: Thu Jul 7 13:02:53 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../columniterator/SSTableReversedIterator.java |  2 +-
 .../cql3/validation/operations/DeleteTest.java  | 26 ++++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3016dc7c/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3016dc7c/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
----------------------------------------------------------------------

Reply via email to