Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f18108d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f18108d8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f18108d8 Branch: refs/heads/trunk Commit: f18108d812bb90d03a4bff5172cd0a428b7cae80 Parents: 14dbba9 5abd129 Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Aug 27 13:09:18 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Aug 27 13:09:18 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../org/apache/cassandra/db/ColumnIndex.java | 2 +- .../org/apache/cassandra/db/RangeTombstone.java | 8 +++++- .../db/compaction/LazilyCompactedRow.java | 3 ++- .../apache/cassandra/db/RangeTombstoneTest.java | 26 ++++++++++++++++++++ 5 files changed, 38 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f18108d8/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f18108d8/src/java/org/apache/cassandra/db/RangeTombstone.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f18108d8/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java ----------------------------------------------------------------------
