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/74d63ba5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74d63ba5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74d63ba5 Branch: refs/heads/cassandra-2.0 Commit: 74d63ba566ef783243802f2ab0c453e8c2440574 Parents: 0c65759 fa15524 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sun Oct 20 00:21:48 2013 +0100 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sun Oct 20 00:21:48 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 1 + .../org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java | 3 +++ 3 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/74d63ba5/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f4d6980,70bb919..41e885e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,29 -1,8 +1,30 @@@ -1.2.12 +2.0.2 + * Update FailureDetector to use nanontime (CASSANDRA-4925) + * Fix FileCacheService regressions (CASSANDRA-6149) + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032) + * Fix race conditions in bulk loader (CASSANDRA-6129) + * Add configurable metrics reporting (CASSANDRA-4430) + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117) + * Track and persist sstable read activity (CASSANDRA-5515) + * Fixes for speculative retry (CASSANDRA-5932) + * Improve memory usage of metadata min/max column names (CASSANDRA-6077) + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081) + * Fix insertion of collections with CAS (CASSANDRA-6069) + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080) + * Track clients' remote addresses in ClientState (CASSANDRA-6070) + * Create snapshot dir if it does not exist when migrating + leveled manifest (CASSANDRA-6093) + * make sequential nodetool repair the default (CASSANDRA-5950) + * Add more hooks for compaction strategy implementations (CASSANDRA-6111) + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098) + * Delete can potentially be skipped in batch (CASSANDRA-6115) + * Allow alter keyspace on system_traces (CASSANDRA-6016) + * Disallow empty column names in cql (CASSANDRA-6136) + * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383) + * Save compaction history to system keyspace (CASSANDRA-5078) + * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166) +Merged from 1.2: + * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) - - -1.2.11 * Add a warning for small LCS sstable size (CASSANDRA-6191) * Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191) * Mark CF clean if a mutation raced the drop and got it marked dirty http://git-wip-us.apache.org/repos/asf/cassandra/blob/74d63ba5/NEWS.txt ---------------------------------------------------------------------- diff --cc NEWS.txt index 4bffa77,d803f02..7bd0d63 --- a/NEWS.txt +++ b/NEWS.txt @@@ -32,17 -25,14 +32,18 @@@ New feature replace_node workflows to replace a dead node in place. Works like the old options, but takes the IP address of the node to be replaced. ++ +2.0.1 +===== Upgrading --------- - - ColumnFamilyMetrics#sstablesPerReadHistogram switched from uniform sampling - to biased-to-last-five-minutes sampling. + - The default memtable allocation has changed from 1/3 of heap to 1/4 + of heap. Also, default (single-partition) read and write timeouts + have been reduced from 10s to 5s and 2s, respectively. -1.2.10 -====== +2.0.0 +===== Upgrading --------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/74d63ba5/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java ----------------------------------------------------------------------