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/8a64f0e0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a64f0e0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a64f0e0 Branch: refs/heads/trunk Commit: 8a64f0e03778c11d91a6affae558b194172f5b65 Parents: 1cb0dff dc38e4b Author: Sylvain Lebresne <[email protected]> Authored: Wed Feb 26 14:49:01 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Feb 26 14:49:01 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/AtomicBTreeColumns.java | 28 +++-- .../cassandra/db/CollationController.java | 6 +- .../org/apache/cassandra/db/DeletionInfo.java | 15 ++- .../org/apache/cassandra/db/RangeTombstone.java | 5 + .../apache/cassandra/db/RangeTombstoneList.java | 65 ++++++++++-- .../cassandra/db/filter/IDiskAtomFilter.java | 2 + .../cassandra/db/filter/NamesQueryFilter.java | 30 ++++++ .../apache/cassandra/db/filter/QueryFilter.java | 9 ++ .../cassandra/db/filter/SliceQueryFilter.java | 41 ++++++++ .../cassandra/db/RangeTombstoneListTest.java | 26 ++--- .../apache/cassandra/db/RangeTombstoneTest.java | 102 +++++++++++++++++++ .../cassandra/tools/SSTableImportTest.java | 2 +- 13 files changed, 294 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a64f0e0/CHANGES.txt ----------------------------------------------------------------------
