Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb603774 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb603774 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb603774 Branch: refs/heads/trunk Commit: fb60377442b893590a663d1decd079d7dcb1f055 Parents: 1f7a5d1 4d36bbf Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Dec 20 09:44:58 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Dec 20 09:44:58 2013 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/service/pager/AbstractQueryPager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb603774/src/java/org/apache/cassandra/service/pager/AbstractQueryPager.java ----------------------------------------------------------------------
