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