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/3d7c5fdd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d7c5fdd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d7c5fdd Branch: refs/heads/trunk Commit: 3d7c5fdd30fd162b0eb3d2a85faa8b70075be109 Parents: 7c73027 6ed241a Author: Aleksey Yeschenko <[email protected]> Authored: Thu Feb 20 21:36:08 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Feb 20 21:36:08 2014 +0300 ---------------------------------------------------------------------- .../cassandra/db/ArrayBackedSortedColumns.java | 126 +++++++++++-------- .../apache/cassandra/db/AtomicBTreeColumns.java | 2 +- .../org/apache/cassandra/db/ColumnFamily.java | 7 +- .../AbstractSimplePerColumnSecondaryIndex.java | 19 +-- 4 files changed, 86 insertions(+), 68 deletions(-) ----------------------------------------------------------------------
