Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fdf293dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fdf293dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fdf293dc Branch: refs/heads/trunk Commit: fdf293dc1547112dc43752676635895b481288cb Parents: 11d1edc d1f38cd Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Aug 26 15:37:10 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Aug 26 15:37:10 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/LazilyCompactedRow.java | 7 +-- .../apache/cassandra/db/RangeTombstoneTest.java | 56 ++++++++++++++++++++ 3 files changed, 61 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fdf293dc/CHANGES.txt ----------------------------------------------------------------------
