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/e9cfc64b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9cfc64b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9cfc64b Branch: refs/heads/trunk Commit: e9cfc64b16b8bc6fae83bc5869979e1a1a32d07b Parents: ee4b50c d7bf566 Author: Jonathan Ellis <[email protected]> Authored: Sun Sep 29 16:55:14 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Sun Sep 29 16:55:14 2013 -0500 ---------------------------------------------------------------------- NEWS.txt | 9 ++++++++ .../org/apache/cassandra/config/CFMetaData.java | 5 ++-- .../apache/cassandra/db/ColumnFamilyStore.java | 14 +++++++----- .../cassandra/metrics/ColumnFamilyMetrics.java | 24 ++++++++++++-------- .../cassandra/metrics/LatencyMetrics.java | 13 ++++------- .../cassandra/service/AbstractReadExecutor.java | 9 ++++---- .../apache/cassandra/service/StorageProxy.java | 12 +++++++--- 7 files changed, 52 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9cfc64b/NEWS.txt ---------------------------------------------------------------------- diff --cc NEWS.txt index a7576d2,1f76277..85e95a1 --- a/NEWS.txt +++ b/NEWS.txt @@@ -14,18 -14,15 +14,27 @@@ restore snapshots created with the prev using the provided 'sstableupgrade' tool. +2.1 +=== + +Upgrading +--------- + - Rolling upgrades from anything pre-2.0 is not supported. + - For leveled compaction users, 2.0 must be atleast started before + upgrading to 2.1 due to the fact that the old JSON leveled + manifest is migrated into the sstable metadata files on startup + in 2.0 and this code is gone from 2.1. + + + 2.0.2 + ===== + + New features + ------------ + - Speculative retry defaults to 99th percentile + (See blog post at TODO) + + 2.0.1 ===== http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9cfc64b/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9cfc64b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9cfc64b/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
