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/71e83f35 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71e83f35 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71e83f35 Branch: refs/heads/cassandra-3.1 Commit: 71e83f35fe5c97d87bdcd217374160b5eaf59096 Parents: e092873 587fd9f Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Fri Dec 4 15:38:17 2015 -0600 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Fri Dec 4 15:38:17 2015 -0600 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/cql3/CQLTester.java | 4 ++-- test/unit/org/apache/cassandra/cql3/ViewTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
