You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2016/02/11 22:58:00 UTC

[3/3] cassandra git commit: Merge branch 'CASSANDRA-11146-3.0' into CASSANDRA-11146-trunk

Merge branch 'CASSANDRA-11146-3.0' into CASSANDRA-11146-trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32aa5b45
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32aa5b45
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32aa5b45

Branch: refs/heads/CASSANDRA-11146-trunk
Commit: 32aa5b458abead5b65d72cc2aa35af6c6cce2e12
Parents: bc8e878 9d1d061
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Thu Feb 11 15:57:44 2016 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Thu Feb 11 15:57:44 2016 -0600

----------------------------------------------------------------------
 .../apache/cassandra/db/marshal/UserType.java    |  2 +-
 .../cql3/validation/entities/JsonTest.java       | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------