Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c53dc3a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c53dc3a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c53dc3a
Branch: refs/heads/trunk
Commit: 4c53dc3a95ea5a3fdda9283e8baf0b21423d9c14
Parents: d5947ee 655f056
Author: Sylvain Lebresne <[email protected]>
Authored: Wed Jun 3 14:24:41 2015 +0200
Committer: Sylvain Lebresne <[email protected]>
Committed: Wed Jun 3 14:24:41 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../org/apache/cassandra/db/DeletionTime.java | 5 +
.../org/apache/cassandra/db/RangeTombstone.java | 194 +++++++++++++------
.../db/compaction/LazilyCompactedRow.java | 3 +
4 files changed, 149 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c53dc3a/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c53dc3a/src/java/org/apache/cassandra/db/RangeTombstone.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c53dc3a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
----------------------------------------------------------------------
