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/7c730279 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c730279 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c730279 Branch: refs/heads/trunk Commit: 7c730279e8d6d29d0ab7b902826f6fd40e0cc390 Parents: 4d75ed2 5223c47 Author: Jonathan Ellis <[email protected]> Authored: Thu Feb 20 11:36:55 2014 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Thu Feb 20 11:36:55 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../apache/cassandra/db/AtomicBTreeColumns.java | 14 ++++++++---- .../org/apache/cassandra/utils/btree/BTree.java | 24 ++++++++++++++++---- 3 files changed, 30 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
