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/c31ecba4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c31ecba4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c31ecba4 Branch: refs/heads/trunk Commit: c31ecba4b516c6fa6ab2a879e45c4f035bd70d27 Parents: 55269db affb10c Author: Sylvain Lebresne <[email protected]> Authored: Mon Jun 22 18:13:43 2015 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Jun 22 18:13:43 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 3 +++ src/java/org/apache/cassandra/tools/SSTableExport.java | 3 +++ src/java/org/apache/cassandra/tools/SSTableImport.java | 4 ++++ 4 files changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c31ecba4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3a22387,1e2acc4..c2c62ae --- 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 + * Deprected sstable2json and json2sstable (CASSANDRA-9618) * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c31ecba4/NEWS.txt ----------------------------------------------------------------------
