Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23a84f0d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23a84f0d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23a84f0d Branch: refs/heads/trunk Commit: 23a84f0d28c3e1121e493152974c7bb507775d3b Parents: 32a682a 174a0aa Author: Robert Stupp <sn...@snazy.de> Authored: Mon Nov 23 16:48:53 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Mon Nov 23 16:48:53 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cql3/functions/JavaBasedUDFunction.java | 15 +++++ .../cql3/functions/UDFByteCodeVerifier.java | 21 ++++++- .../cassandra/cql3/functions/UDFunction.java | 6 ++ .../cql3/validation/entities/UFTest.java | 42 ++++++++++++- .../validation/entities/UFVerifierTest.java | 62 +++++++++++++++----- 6 files changed, 128 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/23a84f0d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6c879a4,4182cc1..1a46cb3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.1 +3.1 +Merged from 3.0: + * Unable to create a function with argument of type Inet (CASSANDRA-10741) * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717) * Correctly preserve deletion info on updated rows when notifying indexers of single-row deletions (CASSANDRA-10694)
