Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f60a201a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f60a201a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f60a201a Branch: refs/heads/trunk Commit: f60a201a3783e10ca52e99b5288c1e2621d63ebb Parents: 6019445 302eb46 Author: Sylvain Lebresne <[email protected]> Authored: Fri May 29 11:12:03 2015 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Fri May 29 11:12:03 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/f60a201a/CHANGES.txt ----------------------------------------------------------------------
