Merge branch 'cassandra-2.2' into trunk
Conflicts:
src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
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/48fc0b8d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48fc0b8d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48fc0b8d
Branch: refs/heads/trunk
Commit: 48fc0b8d0d8b371a9e88cab3f62389c613c2cffd
Parents: eae3b02 0355a77
Author: Sylvain Lebresne <[email protected]>
Authored: Fri Jul 24 09:52:23 2015 +0200
Committer: Sylvain Lebresne <[email protected]>
Committed: Fri Jul 24 09:52:23 2015 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
