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/247bc2e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/247bc2e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/247bc2e6 Branch: refs/heads/trunk Commit: 247bc2e67ef6f6dee870b876d6c470073835c8c6 Parents: ed65ff9 3ae01dd Author: Robert Stupp <sn...@snazy.de> Authored: Wed Sep 30 13:25:13 2015 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Wed Sep 30 13:25:13 2015 +0200 ---------------------------------------------------------------------- .../cql3/functions/JavaBasedUDFunction.java | 2 +- .../cql3/functions/ScriptBasedUDFunction.java | 4 +- .../cql3/functions/SecurityThreadGroup.java | 19 ++- .../functions/ThreadAwareSecurityManager.java | 57 +++++--- .../cassandra/cql3/functions/UDFunction.java | 12 +- .../validation/entities/UFPureScriptTest.java | 99 ------------- .../UFPureScriptTupleCollectionTest.java | 138 +++++++++++++++++++ 7 files changed, 207 insertions(+), 124 deletions(-) ----------------------------------------------------------------------
