Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6dc1004c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6dc1004c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6dc1004c Branch: refs/heads/trunk Commit: 6dc1004ce7eded5b0c89a92e4c495c32d2de2819 Parents: b63e6ee 9b5af91 Author: Tyler Hobbs <[email protected]> Authored: Thu Feb 11 10:29:55 2016 -0600 Committer: Tyler Hobbs <[email protected]> Committed: Thu Feb 11 10:29:55 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 3 +- src/java/org/apache/cassandra/cql3/Json.java | 10 ++- .../cassandra/cql3/selection/Selection.java | 2 +- .../apache/cassandra/db/marshal/AsciiType.java | 2 +- .../apache/cassandra/db/marshal/MapType.java | 2 +- .../apache/cassandra/db/marshal/UTF8Type.java | 2 +- .../apache/cassandra/db/marshal/UserType.java | 2 +- .../cql3/validation/entities/JsonTest.java | 70 +++++++++++++++++--- 8 files changed, 77 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6dc1004c/CHANGES.txt ----------------------------------------------------------------------
