merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/105dcdbf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/105dcdbf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/105dcdbf Branch: refs/heads/cassandra-2.1 Commit: 105dcdbf320a068de9b28c4c182fd37bd1292906 Parents: e344314 a3b3149 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Mar 13 13:06:07 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Mar 13 13:06:07 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 8 ++++++++ src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/105dcdbf/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 27cb235,2413b51..eb82a1c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,16 +1,30 @@@ -2.0.7 +2.1.0-beta2 + * 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) +Merged from 2.0: ++ * fix nodetool getsstables for blob PK (CASSANDRA-6803) + * Fix saving triggers to schema (CASSANDRA-6789) + * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790) + * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838) + * Fix static counter columns (CASSANDRA-6827) + * Restore expiring->deleted (cell) compaction optimization (CASSANDRA-6844) + * Fix CompactionManager.needsCleanup (CASSANDRA-6845) + * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779) -Merged from 1.2: - * fix nodetool getsstables for blob PK (CASSANDRA-6803) - - -2.0.6 * Avoid race-prone second "scrub" of system keyspace (CASSANDRA-6797) * Pool CqlRecordWriter clients by inetaddress rather than Range (CASSANDRA-6665) http://git-wip-us.apache.org/repos/asf/cassandra/blob/105dcdbf/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
