Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3D82910401 for ; Wed, 19 Mar 2014 06:03:35 +0000 (UTC) Received: (qmail 69136 invoked by uid 500); 19 Mar 2014 06:03:29 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 69055 invoked by uid 500); 19 Mar 2014 06:03:28 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 68756 invoked by uid 99); 19 Mar 2014 06:03:26 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Mar 2014 06:03:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D9649983CAF; Wed, 19 Mar 2014 06:03:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Wed, 19 Mar 2014 06:03:27 -0000 Message-Id: <3b4ab0d1b4554f83b6b0eaedc0e2b13e@git.apache.org> In-Reply-To: <800b79bddbc9423eae84068081cfbb52@git.apache.org> References: <800b79bddbc9423eae84068081cfbb52@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/7] git commit: merge from 2.0 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/e1059828 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1059828 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1059828 Branch: refs/heads/trunk Commit: e105982877ed32b69672d3431ee4ea57e1f93e4b Parents: 11a9618 f5e1cbc Author: Jonathan Ellis Authored: Wed Mar 19 00:15:45 2014 -0500 Committer: Jonathan Ellis Committed: Wed Mar 19 00:15:45 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/service/StorageProxy.java | 16 ++++++++-------- .../service/paxos/AbstractPaxosCallback.java | 6 ++++-- .../cassandra/service/paxos/PrepareCallback.java | 5 +++-- .../cassandra/service/paxos/ProposeCallback.java | 5 +++-- 5 files changed, 19 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1059828/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 9f66506,7eebd5b..81db5e2 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,29 -1,5 +1,30 @@@ -2.0.7 +2.1.0-beta2 + * 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) +Merged from 2.0: + * Include correct consistencyLevel in LWT timeout (CASSANDRA-6884) * Lower chances for losing new SSTables during nodetool refresh and ColumnFamilyStore.loadNewSSTables (CASSANDRA-6514) * Add support for DELETE ... IF EXISTS to CQL3 (CASSANDRA-5708) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1059828/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------