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/08/05 21:36:43 UTC

[4/4] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: df192c91d486e66f99a7659db9facff9e2ee6c94
Parents: 143d169 5a902ba
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Fri Aug 5 16:35:36 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Fri Aug 5 16:35:36 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/db/marshal/ByteType.java   | 19 ++---
 .../apache/cassandra/db/marshal/ShortType.java  | 19 ++---
 .../cql3/validation/entities/JsonTest.java      | 76 ++++++++++++++++++++
 4 files changed, 85 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/df192c91/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/df192c91/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
----------------------------------------------------------------------