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/6ed3c195 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ed3c195 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ed3c195 Branch: refs/heads/trunk Commit: 6ed3c19581673e18fdc96576bc748f3c74197a95 Parents: 2b1e6ab 6eea3ea Author: Robert Stupp <[email protected]> Authored: Tue May 19 23:49:09 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Tue May 19 23:49:09 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/CQL3Type.java | 3 +- src/java/org/apache/cassandra/cql3/Cql.g | 4 +- .../statements/CreateAggregateStatement.java | 35 +++++--- .../statements/CreateFunctionStatement.java | 14 +-- .../apache/cassandra/cql3/AggregationTest.java | 93 ++++++++++++++++++-- test/unit/org/apache/cassandra/cql3/UFTest.java | 39 ++++---- 7 files changed, 144 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ed3c195/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f86971a,4e79ea0..9954948 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,5 +1,9 @@@ +3.0: + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801) + * Change gossip stabilization to use endpoit size (CASSANDRA-9401) + 2.2 + * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409) Merged from 2.1: * Use configured gcgs in anticompaction (CASSANDRA-9397)
