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/94ff7a5e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94ff7a5e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94ff7a5e Branch: refs/heads/trunk Commit: 94ff7a5eb988d6f4ae216aa106d5300fe8b8c1e3 Parents: f48c483 30be921 Author: Robert Stupp <[email protected]> Authored: Thu Jun 4 17:07:55 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Thu Jun 4 17:07:55 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cql3/functions/ScriptBasedUDF.java | 4 + .../cassandra/cql3/functions/UDFunction.java | 14 + test/unit/org/apache/cassandra/cql3/UFTest.java | 317 ++++++++++--------- 4 files changed, 188 insertions(+), 148 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/94ff7a5e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 08b2704,43a6cc5..62461c3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +3.0: + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801) + * Change gossip stabilization to use endpoit size (CASSANDRA-9401) + * Change default garbage collector to G1 (CASSANDRA-7486) + + 2.2 + * Add tinyint,smallint,time,date support for UDFs (CASSANDRA-9400) * Deprecates SSTableSimpleWriter and SSTableSimpleUnsortedWriter (CASSANDRA-9546) * Empty INITCOND treated as null in aggregate (CASSANDRA-9457) * Remove use of Cell in Thrift MapReduce classes (CASSANDRA-8609)
