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/9e8391a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e8391a4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e8391a4 Branch: refs/heads/trunk Commit: 9e8391a481844fa277b01d64328cf0d14e779a6d Parents: 3bba76d e49261b Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Aug 27 10:51:00 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Aug 27 10:51:00 2013 +0200 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/service/QueryPagerTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
