Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12af0428 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12af0428 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12af0428 Branch: refs/heads/cassandra-3.7 Commit: 12af0428eacf9bc99e561543c49338107de82062 Parents: a2b73a5 91a48d2 Author: Tyler Hobbs <[email protected]> Authored: Tue May 31 11:41:27 2016 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Tue May 31 11:41:27 2016 -0500 ---------------------------------------------------------------------- .../apache/cassandra/cql3/validation/entities/JsonTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
