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