Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51a87113 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51a87113 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51a87113 Branch: refs/heads/trunk Commit: 51a87113311e78e536ab3632499a186d455f59b8 Parents: 798a7a8 9a78608 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Nov 17 11:52:41 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Nov 17 11:52:41 2015 +0100 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/SchemaLoader.java | 2 +- test/unit/org/apache/cassandra/cql3/CQLTester.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
