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/74b0b8ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74b0b8ac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74b0b8ac Branch: refs/heads/trunk Commit: 74b0b8acc8349b4ee1236416e68a1175d3a90933 Parents: ea36ae9 1de8e39 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Thu May 28 12:16:55 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Thu May 28 12:16:55 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/cql3/CQL3Type.java | 15 + .../cql3/functions/AbstractFunction.java | 19 + .../cassandra/cql3/functions/Function.java | 7 +- .../cassandra/cql3/functions/FunctionCall.java | 2 +- .../cassandra/cql3/selection/Selector.java | 17 +- .../statements/CreateAggregateStatement.java | 18 +- .../statements/CreateFunctionStatement.java | 19 +- .../cql3/statements/DropAggregateStatement.java | 16 +- .../cql3/statements/DropFunctionStatement.java | 12 +- .../cassandra/db/marshal/AbstractType.java | 5 + .../apache/cassandra/cql3/AggregationTest.java | 263 +++++++++++- .../cassandra/cql3/UFIdentificationTest.java | 2 +- test/unit/org/apache/cassandra/cql3/UFTest.java | 412 +++++++++++++++---- 14 files changed, 713 insertions(+), 96 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/74b0b8ac/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e7d16b2,618f063..e40df94 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,6 +1,12 @@@ +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 + * Disallow frozen<> types in function arguments and return types for + clarity (CASSANDRA-9411) * Static Analysis to warn on unsafe use of Autocloseable instances (CASSANDRA-9431) * Update commitlog archiving examples now that commitlog segments are not recycled (CASSANDRA-9350)