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/1af3c3b9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1af3c3b9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1af3c3b9 Branch: refs/heads/trunk Commit: 1af3c3b98961df39aff3159d6a929e3de9194542 Parents: e246ec2 716b253 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Jun 19 17:56:33 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Jun 19 17:56:33 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/cql3/functions/Functions.java | 38 +++++++++++++++----- 2 files changed, 30 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1af3c3b9/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 9b4e474,4886850..c631c8d --- 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 + * Fix mixing min, max, and count aggregates for blob type (CASSANRA-9622) * Rename class for DATE type in Java driver (CASSANDRA-9563) * Duplicate compilation of UDFs on coordinator (CASSANDRA-9475) * Fix connection leak in CqlRecordWriter (CASSANDRA-9576)
