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/89fdaaba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89fdaaba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89fdaaba Branch: refs/heads/trunk Commit: 89fdaabad1eeab0988740dccd86e688ce909ea53 Parents: a89597d 96e7e62 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Jul 1 19:06:27 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Jul 1 19:06:27 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 30 +++++++++++++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/89fdaaba/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3735eda,0abf6db..cbe2cca --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,17 @@@ -2.2.0-rc2 +3.0 + * Add algorithmic token allocation (CASSANDRA-7032) + * 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 + * (cqlsh) Allow setting the initial connection timeout (CASSANDRA-9601) * BulkLoader has --transport-factory option but does not use it (CASSANDRA-9675) * Allow JMX over SSL directly from nodetool (CASSANDRA-9090) * Update cqlsh for UDFs (CASSANDRA-7556)
