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/55269db1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55269db1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55269db1 Branch: refs/heads/trunk Commit: 55269db171e31785f26bbae83a26b8b562337bdf Parents: 4045c29 d6312c5 Author: Robert Stupp <[email protected]> Authored: Mon Jun 22 17:20:18 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Mon Jun 22 17:20:18 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + doc/cql3/CQL.textile | 4 +-- .../statements/CreateAggregateStatement.java | 24 ++++++++----- .../cassandra/schema/LegacySchemaTables.java | 25 ++++++++++--- .../apache/cassandra/cql3/AggregationTest.java | 37 +++++++++++++++++--- test/unit/org/apache/cassandra/cql3/UFTest.java | 1 + 6 files changed, 74 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/55269db1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0830e39,93753e5..3a22387 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +1,16 @@@ +3.0: + * Add nodetool command to replay batchlog (CASSANDRA-9547) + * Make file buffer cache independent of paths being read (CASSANDRA-8897) + * Remove deprecated legacy Hadoop code (CASSANDRA-9353) + * 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) + * Populate TokenMetadata early during startup (CASSANDRA-9317) + * undeprecate cache recentHitRate (CASSANDRA-6591) + + 2.2 + * Allow native functions in user-defined aggregates (CASSANDRA-9542) * Don't repair system_distributed by default (CASSANDRA-9621) * Fix mixing min, max, and count aggregates for blob type (CASSANRA-9622) * Rename class for DATE type in Java driver (CASSANDRA-9563)
