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 B9FD6117D1 for ; Tue, 15 Jul 2014 14:57:43 +0000 (UTC) Received: (qmail 18989 invoked by uid 500); 15 Jul 2014 14:57:43 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 18906 invoked by uid 500); 15 Jul 2014 14:57:42 -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 18627 invoked by uid 99); 15 Jul 2014 14:57:42 -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, 15 Jul 2014 14:57:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9106D94DA3B; Tue, 15 Jul 2014 14:57:42 +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: Tue, 15 Jul 2014 14:57:51 -0000 Message-Id: <47efaf186e22402485019833357d55cf@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/10] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3966935b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3966935b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3966935b Branch: refs/heads/trunk Commit: 3966935b43d4007123869e18d93bab4808e0efbe Parents: 8243b6a 52c6dfb Author: Jonathan Ellis Authored: Tue Jul 15 09:57:34 2014 -0500 Committer: Jonathan Ellis Committed: Tue Jul 15 09:57:34 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 5 +++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3966935b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3966935b/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------