You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2016/03/29 14:02:30 UTC
[17/20] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1de53427
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1de53427
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1de53427
Branch: refs/heads/cassandra-3.5
Commit: 1de534276696a0731721a4bace5e10b416e52425
Parents: 9806a11 fc972b9
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Tue Mar 29 12:57:26 2016 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Tue Mar 29 12:57:26 2016 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/cql3/validation/entities/JsonTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1de53427/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
----------------------------------------------------------------------