Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce0a25fa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce0a25fa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce0a25fa Branch: refs/heads/trunk Commit: ce0a25fa118307fdb929660ec93f39451519ce70 Parents: f58a447 6c0a462 Author: Robert Stupp <[email protected]> Authored: Fri May 15 22:02:57 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Fri May 15 22:02:57 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 6 ++++++ conf/cassandra.yaml | 5 +++++ src/java/org/apache/cassandra/config/Config.java | 2 ++ src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 5 +++++ src/java/org/apache/cassandra/cql3/functions/UDFunction.java | 7 +++++++ .../cassandra/cql3/statements/CreateFunctionStatement.java | 3 +++ test/conf/cassandra.yaml | 1 + 8 files changed, 30 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce0a25fa/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c08d322,e3b25b5..2350e62 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,4 -1,5 +1,5 @@@ -2.2.0-beta1 +2.2 + * Add a flag in cassandra.yaml to enable UDFs (CASSANDRA-9404) * Better support of null for UDF (CASSANDRA-8374) * Use ecj instead of javassist for UDFs (CASSANDRA-8241) * faster async logback configuration for tests (CASSANDRA-9376)
