merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/667e3db9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/667e3db9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/667e3db9 Branch: refs/heads/cassandra-2.0 Commit: 667e3db91cbec9928857aa89bfcc63fe85cb558d Parents: cf83c81 57613dc Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Dec 5 09:44:10 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Dec 5 09:44:10 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 5 ++++- .../apache/cassandra/cache/AutoSavingCache.java | 22 ++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/667e3db9/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d485a69,166c566..8996965 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -16,44 -12,11 +16,47 @@@ Merged from 1.2 * Change snapshot response message verb to INTERNAL to avoid dropping it (CASSANDRA-6415) * Warn when collection read has > 65K elements (CASSANDRA-5428) + * Fix cache persistence when both row and key cache are enabled + (CASSANDRA-6413) -1.2.12 +2.0.3 + * Fix FD leak on slice read path (CASSANDRA-6275) + * Cancel read meter task when closing SSTR (CASSANDRA-6358) + * free off-heap IndexSummary during bulk (CASSANDRA-6359) + * Recover from IOException in accept() thread (CASSANDRA-6349) + * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338) + * Fix trying to hint timed out counter writes (CASSANDRA-6322) + * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809) + * Avoid flushing compaction_history after each operation (CASSANDRA-6287) + * Fix repair assertion error when tombstones expire (CASSANDRA-6277) + * Skip loading corrupt key cache (CASSANDRA-6260) + * Fixes for compacting larger-than-memory rows (CASSANDRA-6274) + * Compact hottest sstables first and optionally omit coldest from + compaction entirely (CASSANDRA-6109) + * Fix modifying column_metadata from thrift (CASSANDRA-6182) + * cqlsh: fix LIST USERS output (CASSANDRA-6242) + * Add IRequestSink interface (CASSANDRA-6248) + * Update memtable size while flushing (CASSANDRA-6249) + * Provide hooks around CQL2/CQL3 statement execution (CASSANDRA-6252) + * Require Permission.SELECT for CAS updates (CASSANDRA-6247) + * New CQL-aware SSTableWriter (CASSANDRA-5894) + * Reject CAS operation when the protocol v1 is used (CASSANDRA-6270) + * Correctly throw error when frame too large (CASSANDRA-5981) + * Fix serialization bug in PagedRange with 2ndary indexes (CASSANDRA-6299) + * Fix CQL3 table validation in Thrift (CASSANDRA-6140) + * Fix bug missing results with IN clauses (CASSANDRA-6327) + * Fix paging with reversed slices (CASSANDRA-6343) + * Set minTimestamp correctly to be able to drop expired sstables (CASSANDRA-6337) + * Support NaN and Infinity as float literals (CASSANDRA-6003) + * Remove RF from nodetool ring output (CASSANDRA-6289) + * Fix attempting to flush empty rows (CASSANDRA-6374) + * Fix potential out of bounds exception when paging (CASSANDRA-6333) +Merged from 1.2: + * Optimize FD phi calculation (CASSANDRA-6386) + * Improve initial FD phi estimate when starting up (CASSANDRA-6385) - * Don't list CQL3 table in CLI describe even if named explicitely (CASSANDRA-5750) ++ * Don't list CQL3 table in CLI describe even if named explicitely ++ (CASSANDRA-5750) * Invalidate row cache when dropping CF (CASSANDRA-6351) * add non-jamm path for cached statements (CASSANDRA-6293) * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) http://git-wip-us.apache.org/repos/asf/cassandra/blob/667e3db9/src/java/org/apache/cassandra/cache/AutoSavingCache.java ----------------------------------------------------------------------
