Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bc3e7f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bc3e7f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bc3e7f1 Branch: refs/heads/trunk Commit: 6bc3e7f18a6f4792d0544187c7743db822ea4e82 Parents: e975ab8 e0857f2 Author: Sylvain Lebresne <[email protected]> Authored: Tue Feb 25 10:50:01 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Feb 25 10:50:01 2014 +0100 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/service/QueryPagerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
