Merge branch 'cassandra-1.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/4df6c287 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4df6c287 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4df6c287 Branch: refs/heads/trunk Commit: 4df6c287506b3d4f1628140fbcbb754cb445549e Parents: 20c0baf f5b224c Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Jul 15 10:33:51 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Jul 15 10:33:51 2013 +0200 ---------------------------------------------------------------------- .../apache/cassandra/db/RangeTombstoneList.java | 13 +++---- .../cassandra/db/RangeTombstoneListTest.java | 37 ++++++++++++++++++++ 2 files changed, 44 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4df6c287/src/java/org/apache/cassandra/db/RangeTombstoneList.java ----------------------------------------------------------------------
