Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0355a77a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0355a77a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0355a77a
Branch: refs/heads/trunk
Commit: 0355a77aa5273de54972daf46be5f6ebeb6f9a9e
Parents: 9ad1330 b087897
Author: Sylvain Lebresne <[email protected]>
Authored: Fri Jul 24 09:25:15 2015 +0200
Committer: Sylvain Lebresne <[email protected]>
Committed: Fri Jul 24 09:25:15 2015 +0200
----------------------------------------------------------------------
.../cassandra/service/pager/RangeSliceQueryPager.java | 5 ++++-
.../cassandra/service/pager/SliceQueryPager.java | 13 +++++++++----
2 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
