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/229e6128 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/229e6128 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/229e6128 Branch: refs/heads/trunk Commit: 229e6128204eeceea5431fd45e5b332c3c238735 Parents: e4c99d6 d5c3d2f Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Feb 20 02:27:07 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Feb 20 02:27:07 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/ArrayBackedSortedColumns.java | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
