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/6d59bbcf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d59bbcf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d59bbcf Branch: refs/heads/trunk Commit: 6d59bbcfbd24e9bcf2d1c34397a076748b91d5ac Parents: 964b2eb 081a372 Author: Aleksey Yeschenko <[email protected]> Authored: Wed Jun 10 13:05:27 2015 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Jun 10 13:05:27 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d59bbcf/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 037f785,1b75756..7060f79 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,8 +1,17 @@@ +3.0: + * 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) + + 2.2 * Make sure we cancel non-compacting sstables from LifecycleTransaction (CASSANDRA-9566) + + + 2.2.0-rc1 * Compressed commit log should measure compressed space used (CASSANDRA-9095) * Fix comparison bug in CassandraRoleManager#collectRoles (CASSANDRA-9551) * Add tinyint,smallint,time,date support for UDFs (CASSANDRA-9400)
