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/bf14e5b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf14e5b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf14e5b1 Branch: refs/heads/trunk Commit: bf14e5b16c4f781158605ccc9e490913fee20cd7 Parents: 8bc7ab1 32369eb Author: Aleksey Yeschenko <[email protected]> Authored: Tue Apr 22 18:51:08 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Apr 22 18:51:08 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/AtomicBTreeColumns.java | 15 ------- .../apache/cassandra/db/RangeTombstoneTest.java | 46 -------------------- 3 files changed, 1 insertion(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf14e5b1/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf14e5b1/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf14e5b1/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java ----------------------------------------------------------------------
