Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2cabf9c4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2cabf9c4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2cabf9c4 Branch: refs/heads/trunk Commit: 2cabf9c49d0061a9325181a2b66711faecfec31d Parents: d384e78 eca51a0 Author: Robert Stupp <sn...@snazy.de> Authored: Thu Jan 5 22:28:04 2017 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Thu Jan 5 22:28:04 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 + NEWS.txt | 3 ++ doc/cql3/CQL.textile | 2 +- lib/jsr223/clojure/README.txt | 8 --- lib/jsr223/groovy/README.txt | 35 ------------- lib/jsr223/jaskell/README.txt | 5 -- lib/jsr223/jruby/README.txt | 54 -------------------- lib/jsr223/jython/README.txt | 33 ------------ lib/jsr223/scala/README.txt | 37 -------------- .../cql3/functions/ScriptBasedUDFunction.java | 35 +++++-------- .../cql3/validation/entities/UFScriptTest.java | 3 +- .../validation/entities/UFSecurityTest.java | 12 ++++- 12 files changed, 31 insertions(+), 198 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cabf9c4/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cabf9c4/NEWS.txt ----------------------------------------------------------------------
