Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91a48d2a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91a48d2a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91a48d2a Branch: refs/heads/cassandra-3.0 Commit: 91a48d2a5eff647fd1af7e8a2f7ae14ec4cf7d52 Parents: 57ead56 a5dac12 Author: Tyler Hobbs <[email protected]> Authored: Tue May 31 11:41:09 2016 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Tue May 31 11:41:09 2016 -0500 ---------------------------------------------------------------------- .../apache/cassandra/cql3/validation/entities/JsonTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/91a48d2a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java ----------------------------------------------------------------------
