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/ac09f2c9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac09f2c9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac09f2c9 Branch: refs/heads/trunk Commit: ac09f2c949efbdbd8cf24b5664c12123f09be3ce Parents: 229e612 974a3cc Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Feb 20 02:49:57 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Feb 20 02:49:57 2014 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------