cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Thu, 05 Apr 2018 13:23:14 GMT
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/41f3b96f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41f3b96f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41f3b96f

Branch: refs/heads/cassandra-3.11
Commit: 41f3b96f81e08af8a95124b9ab50bad03067aab0
Parents: 2d2b1a7 2e5e11d
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Thu Apr 5 06:16:13 2018 -0700
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Thu Apr 5 06:20:57 2018 -0700

----------------------------------------------------------------------
 .../org/apache/cassandra/cql3/functions/FunctionCall.java |  2 ++
 .../cassandra/cql3/validation/entities/JsonTest.java      | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/41f3b96f/src/java/org/apache/cassandra/cql3/functions/FunctionCall.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/41f3b96f/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
index 94b2087,46cdd52..62c6226
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
@@@ -39,7 -38,7 +39,8 @@@ import java.util.*
  import java.util.concurrent.*;
  import static org.junit.Assert.fail;
  
--public class JsonTest extends CQLTester
++public class
++JsonTest extends CQLTester
  {
      @BeforeClass
      public static void setUp()


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message