Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3faa17be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3faa17be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3faa17be Branch: refs/heads/trunk Commit: 3faa17be5f8136ecc8ca3e3cb1074103fca1055f Parents: 684ef27 f9b6d3d Author: Sam Tunnicliffe <[email protected]> Authored: Wed May 20 14:20:32 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Wed May 20 14:20:32 2015 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/db/SystemKeyspaceTest.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
