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/5abd129f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5abd129f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5abd129f Branch: refs/heads/trunk Commit: 5abd129fd9ff80aa689b830452b528f04d45eb82 Parents: 1be0bbf 049762b Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Aug 27 13:07:16 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Aug 27 13:07:16 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/5abd129f/CHANGES.txt ----------------------------------------------------------------------
