Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c6dbba1b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6dbba1b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6dbba1b Branch: refs/heads/trunk Commit: c6dbba1bbd2cf52bf3173c920e4526e9365a9d42 Parents: e34d1af 4f47a44 Author: Brandon Williams <[email protected]> Authored: Wed Apr 2 14:53:42 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Apr 2 14:53:42 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 - .../apache/cassandra/net/MessagingService.java | 13 +++++- .../org/apache/cassandra/utils/ExpiringMap.java | 47 +++++++++++++++----- .../apache/cassandra/service/RemoveTest.java | 1 + 4 files changed, 47 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6dbba1b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d5c8372,9003309..7da222e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,46 -1,5 +1,45 @@@ -2.0.7 +2.1.0-beta2 + * Fail write instead of logging a warning when unable to append to CL + (CASSANDRA-6764) + * Eliminate possibility of CL segment appearing twice in active list + (CASSANDRA-6557) + * Apply DONTNEED fadvise to commitlog segments (CASSANDRA-6759) + * Switch CRC component to Adler and include it for compressed sstables + (CASSANDRA-4165) + * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451) + * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899) + * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897) + * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573) + * Fix ABTC NPE and apply update function correctly (CASSANDRA-6692) + * Allow nodetool to use a file or prompt for password (CASSANDRA-6660) + * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742) + * Fix assertion error in ALTER TYPE RENAME (CASSANDRA-6705) + * Scrub should not always clear out repaired status (CASSANDRA-5351) + * Improve handling of range tombstone for wide partitions (CASSANDRA-6446) + * Fix ClassCastException for compact table with composites (CASSANDRA-6738) + * Fix potentially repairing with wrong nodes (CASSANDRA-6808) + * Change caching option syntax (CASSANDRA-6745) + * Fix stress to do proper counter reads (CASSANDRA-6835) + * Fix help message for stress counter_write (CASSANDRA-6824) + * Fix stress smart Thrift client to pick servers correctly (CASSANDRA-6848) + * Add logging levels (minimal, normal or verbose) to stress tool (CASSANDRA-6849) + * Fix race condition in Batch CLE (CASSANDRA-6860) + * Improve cleanup/scrub/upgradesstables failure handling (CASSANDRA-6774) + * ByteBuffer write() methods for serializing sstables (CASSANDRA-6781) + * Proper compare function for CollectionType (CASSANDRA-6783) + * Update native server to Netty 4 (CASSANDRA-6236) + * Fix off-by-one error in stress (CASSANDRA-6883) + * Make OpOrder AutoCloseable (CASSANDRA-6901) + * Remove sync repair JMX interface (CASSANDRA-6900) + * Add multiple memory allocation options for memtables (CASSANDRA-6689) + * Remove adjusted op rate from stress output (CASSANDRA-6921) + * Add optimized CF.hasColumns() implementations (CASSANDRA-6941) + * Serialize batchlog mutations with the version of the target node + (CASSANDRA-6931) + * Optimize CounterColumn#reconcile() (CASSANDRA-6953) + * Properly remove 1.2 sstable support in 2.1 (CASSANDRA-6869) +Merged from 2.0: * Allow compaction of system tables during startup (CASSANDRA-6913) - * Don't shut ExpiringMap down (CASSANDRA-6948) * Restrict Windows to parallel repairs (CASSANDRA-6907) * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436) * Fix NPE in MeteredFlusher (CASSANDRA-6820) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6dbba1b/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6dbba1b/test/unit/org/apache/cassandra/service/RemoveTest.java ----------------------------------------------------------------------
