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/86c7785a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86c7785a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86c7785a Branch: refs/heads/trunk Commit: 86c7785af24fe2cb7189785e8aea3cd926050d3f Parents: 36e4f4f 4c53dc3 Author: Sylvain Lebresne <[email protected]> Authored: Wed Jun 3 14:25:04 2015 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Jun 3 14:25:04 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/86c7785a/CHANGES.txt ----------------------------------------------------------------------
