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/39b41314 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39b41314 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39b41314 Branch: refs/heads/trunk Commit: 39b413149077a9102fcd68e3596ae53be68c7a1c Parents: 1a14efd 96677ca Author: Marcus Eriksson <[email protected]> Authored: Thu Jun 4 17:23:19 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Thu Jun 4 17:23:50 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/39b41314/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2c0c0b3,232e264..53d576f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,3 +1,10 @@@ +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) ++ * Populate TokenMetadata early during startup (CASSANDRA-9317) + + 2.2 * Add tinyint,smallint,time,date support for UDFs (CASSANDRA-9400) * Deprecates SSTableSimpleWriter and SSTableSimpleUnsortedWriter (CASSANDRA-9546)
