[11/14] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.11

http://git-wip-us.apache.org/repos/asf/cassandra/blob/48ffad89/test/unit/org/apache/cassandra/db/marshal/JsonConversionTest.java -- diff --cc test/unit/org/apache/cassandra/db/marshal/JsonConversionTest.java index

[11/14] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1553d864 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1553d864 Diff: