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 0BED31032A for ; Tue, 11 Feb 2014 23:16:56 +0000 (UTC) Received: (qmail 85173 invoked by uid 500); 11 Feb 2014 23:16:53 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 85076 invoked by uid 500); 11 Feb 2014 23:16:52 -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 85011 invoked by uid 99); 11 Feb 2014 23:16:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Feb 2014 23:16:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 993AF9249F1; Tue, 11 Feb 2014 23:16:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Tue, 11 Feb 2014 23:16:55 -0000 Message-Id: In-Reply-To: <634ab2dbc53c4ec8a70ea518a45c106b@git.apache.org> References: <634ab2dbc53c4ec8a70ea518a45c106b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] git commit: Merge branch 'cassandra-2.0' into trunk Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/afd63687 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/afd63687 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/afd63687 Branch: refs/heads/trunk Commit: afd6368745d6ac4bc43e70cc1c4b47ce59f754e7 Parents: aac421a c5f225b Author: Brandon Williams Authored: Tue Feb 11 17:14:01 2014 -0600 Committer: Brandon Williams Committed: Tue Feb 11 17:14:01 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/service/StorageService.java | 12 ++++++++++++ 2 files changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/afd63687/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 8e7e249,fd640cd..1025510 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -42,7 -9,10 +42,8 @@@ * Correctly handle null with IF conditions and TTL (CASSANDRA-6623) * Account for range/row tombstones in tombstone drop time histogram (CASSANDRA-6522) - * Stop CommitLogSegment.close() from calling sync() (CASSANDRA-6652) - * Make commitlog failure handling configurable (CASSANDRA-6364) Merged from 1.2: + * Fix broken streams when replacing with same IP (CASSANDRA-6622) * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645) * Fix partition and range deletes not triggering flush (CASSANDRA-6655) * Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667) http://git-wip-us.apache.org/repos/asf/cassandra/blob/afd63687/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------