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/434e0428 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/434e0428 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/434e0428 Branch: refs/heads/trunk Commit: 434e04281067b548712ff54501e76bcffa4d598e Parents: dc1dad3 5f82aa3 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Feb 17 20:41:39 2014 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Feb 17 20:41:39 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../org/apache/cassandra/utils/btree/BTree.java | 59 +------------- .../apache/cassandra/utils/btree/BTreeSet.java | 2 +- .../apache/cassandra/utils/btree/Builder.java | 6 +- .../cassandra/utils/btree/NodeBuilder.java | 85 +++++++++++++------- .../cassandra/utils/btree/UpdateFunction.java | 29 +++++++ .../apache/cassandra/utils/LongBTreeTest.java | 17 +++- 7 files changed, 106 insertions(+), 94 deletions(-) ----------------------------------------------------------------------
