Merge branch 'cassandra-3.0' into cassandra-3.8
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/062bd073 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/062bd073 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/062bd073 Branch: refs/heads/trunk Commit: 062bd0730af1f5e9665e8873f7b336b221ec3226 Parents: 4e46ec9 01ae279 Author: Tyler Hobbs <[email protected]> Authored: Wed Aug 17 17:05:15 2016 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Wed Aug 17 17:05:15 2016 -0500 ---------------------------------------------------------------------- build.xml | 2 +- test/conf/logback-test.xml | 2 +- test/unit/org/apache/cassandra/cql3/CQLTester.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/062bd073/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/062bd073/test/conf/logback-test.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/062bd073/test/unit/org/apache/cassandra/cql3/CQLTester.java ----------------------------------------------------------------------
