Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/daf7606a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/daf7606a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/daf7606a Branch: refs/heads/trunk Commit: daf7606a6c283ce5c231adf766a954bd1d8cf5c2 Parents: 8338238 1de5342 Author: Sam Tunnicliffe <[email protected]> Authored: Tue Mar 29 12:59:32 2016 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Tue Mar 29 12:59:32 2016 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/validation/entities/JsonTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
