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/698c8088 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/698c8088 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/698c8088 Branch: refs/heads/trunk Commit: 698c80883dc6a0f6e80bdaa5e8f4f11871e4a461 Parents: 36950f2 c64d3a5 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Thu Feb 18 11:10:06 2016 -0600 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Thu Feb 18 11:10:06 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/marshal/UserType.java | 2 +- .../cql3/validation/entities/JsonTest.java | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/698c8088/CHANGES.txt ----------------------------------------------------------------------
