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/81858ebc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81858ebc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/81858ebc Branch: refs/heads/trunk Commit: 81858ebcbda2149d94e4c83e20965832a3f43734 Parents: 7476d83 17d43fa Author: Sam Tunnicliffe <[email protected]> Authored: Mon Jun 15 20:01:23 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Mon Jun 15 20:01:23 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/hadoop/cql3/CqlRecordWriter.java | 61 ++++++++++---------- 2 files changed, 30 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/81858ebc/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 35e02a2,ba8ef12..de85f61 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ +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) + * undeprecate cache recentHitRate (CASSANDRA-6591) + + 2.2 + * Fix connection leak in CqlRecordWriter (CASSANDRA-9576) * Mlockall before opening system sstables & remove boot_without_jna option (CASSANDRA-9573) * Add functions to convert timeuuid to date or time, deprecate dateOf and unixTimestampOf (CASSANDRA-9229) * Make sure we cancel non-compacting sstables from LifecycleTransaction (CASSANDRA-9566) http://git-wip-us.apache.org/repos/asf/cassandra/blob/81858ebc/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java ----------------------------------------------------------------------
