Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/302eb46c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/302eb46c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/302eb46c Branch: refs/heads/cassandra-2.2 Commit: 302eb46c8cd165fbacb950fd99760470b9f8f751 Parents: 180130a e1a67a4 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri May 29 11:05:53 2015 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri May 29 11:05:53 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/RangeTombstoneList.java | 4 +-- .../cassandra/db/RangeTombstoneListTest.java | 27 +++++++++++++++++--- 3 files changed, 26 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/302eb46c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/302eb46c/src/java/org/apache/cassandra/db/RangeTombstoneList.java ----------------------------------------------------------------------
