Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e49261b4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e49261b4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e49261b4 Branch: refs/heads/cassandra-2.0 Commit: e49261b46f8db7ccee4205b6dc54741e5d2cc73e Parents: db381ea c284786 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Aug 27 10:50:45 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Aug 27 10:50:45 2013 +0200 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/service/QueryPagerTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
