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/887bbc14 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/887bbc14 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/887bbc14 Branch: refs/heads/trunk Commit: 887bbc141e6c6b26fafb857ca21c00c79ba1e4cf Parents: 2c360e6 b61da9b Author: Sam Tunnicliffe <s...@beobal.com> Authored: Thu Jun 11 20:16:32 2015 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Thu Jun 11 20:16:32 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++-- src/java/org/apache/cassandra/service/StartupChecks.java | 9 +-------- 3 files changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/887bbc14/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 27cc70c,020cb46..b80f272 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ +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) + + 2.2 + * 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) * Fix deprecated repair JMX API (CASSANDRA-9570) http://git-wip-us.apache.org/repos/asf/cassandra/blob/887bbc14/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------
