Merge branch 'cassandra-3.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/d4d71cd3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4d71cd3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4d71cd3 Branch: refs/heads/trunk Commit: d4d71cd331d9119f718b1ef6e4ed2bb3a1258ac1 Parents: 6966fcd 5694a2a Author: Marcus Eriksson <[email protected]> Authored: Wed Aug 17 15:38:12 2016 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Wed Aug 17 15:38:12 2016 +0200 ---------------------------------------------------------------------- test/conf/logback-test.xml | 2 +- test/unit/org/apache/cassandra/cql3/CQLTester.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4d71cd3/test/conf/logback-test.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4d71cd3/test/unit/org/apache/cassandra/cql3/CQLTester.java ----------------------------------------------------------------------
