Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/686b8104 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/686b8104 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/686b8104 Branch: refs/heads/trunk Commit: 686b8104ca7469aee18b9ad4fa8b181e84dca427 Parents: 064144b e16d76d Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Jan 14 18:15:36 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Jan 14 18:15:36 2015 +0100 ---------------------------------------------------------------------- .../db/columniterator/IndexedSliceReader.java | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/686b8104/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java ----------------------------------------------------------------------
