You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2015/08/20 11:47:02 UTC
[1/2] cassandra git commit: Ninja-fix UFPureScriptTest (post-6717
driver update)
Repository: cassandra
Updated Branches:
refs/heads/trunk 110e803ed -> b10c00b28
Ninja-fix UFPureScriptTest (post-6717 driver update)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c997c08c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c997c08c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c997c08c
Branch: refs/heads/trunk
Commit: c997c08c47b049f4278a08b2d0ad9329fdf4a455
Parents: 13172bd
Author: Robert Stupp <sn...@snazy.de>
Authored: Thu Aug 20 11:20:08 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Thu Aug 20 11:20:08 2015 +0200
----------------------------------------------------------------------
.../org/apache/cassandra/cql3/functions/ScriptBasedUDFunction.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c997c08c/src/java/org/apache/cassandra/cql3/functions/ScriptBasedUDFunction.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/functions/ScriptBasedUDFunction.java b/src/java/org/apache/cassandra/cql3/functions/ScriptBasedUDFunction.java
index 19ef769..ce4ea5e 100644
--- a/src/java/org/apache/cassandra/cql3/functions/ScriptBasedUDFunction.java
+++ b/src/java/org/apache/cassandra/cql3/functions/ScriptBasedUDFunction.java
@@ -70,8 +70,10 @@ final class ScriptBasedUDFunction extends UDFunction
"jdk.nashorn.internal.runtime.linker",
// following required by Java Driver
"java.math",
+ "java.nio",
"java.text",
"com.google.common.base",
+ "com.google.common.collect",
"com.google.common.reflect",
// following required by UDF
"com.datastax.driver.core",
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by sn...@apache.org.
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/b10c00b2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b10c00b2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b10c00b2
Branch: refs/heads/trunk
Commit: b10c00b283f9b917dc148e92db845d1d6beb7ab6
Parents: 110e803 c997c08
Author: Robert Stupp <sn...@snazy.de>
Authored: Thu Aug 20 11:20:53 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Thu Aug 20 11:20:53 2015 +0200
----------------------------------------------------------------------
.../org/apache/cassandra/cql3/functions/ScriptBasedUDFunction.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------