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/67baaef0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67baaef0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67baaef0 Branch: refs/heads/trunk Commit: 67baaef0f93fde85aa194ccf651fa673b0acfdf3 Parents: 4938ab5 a133992 Author: Robert Stupp <sn...@snazy.de> Authored: Thu Jun 18 18:03:27 2015 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Thu Jun 18 18:03:27 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + ...r-core-2.2.0-rc1-SNAPSHOT-20150603-shaded.jar | Bin 2155169 -> 0 bytes ...r-core-2.2.0-rc2-SNAPSHOT-20150617-shaded.jar | Bin 0 -> 2154972 bytes .../cassandra/hadoop/cql3/CqlRecordReader.java | 6 +++--- 4 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/67baaef0/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 16d9722,76a42ab..39309a7 --- 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 + * 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) * Mlockall before opening system sstables & remove boot_without_jna option (CASSANDRA-9573)
