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 606EF104C6 for ; Wed, 19 Feb 2014 22:15:59 +0000 (UTC) Received: (qmail 11492 invoked by uid 500); 19 Feb 2014 22:15:51 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 11282 invoked by uid 500); 19 Feb 2014 22:15:45 -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 10899 invoked by uid 99); 19 Feb 2014 22:15:32 -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 Feb 2014 22:15:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 61A8E92855D; Wed, 19 Feb 2014 22:15:31 +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 Feb 2014 22:15:38 -0000 Message-Id: <5c2d4b5e37bc4d2d8462ea09d43aace3@git.apache.org> In-Reply-To: <22a6d0a104fe47558bc2f28c11f945a4@git.apache.org> References: <22a6d0a104fe47558bc2f28c11f945a4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ddaddf63 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddaddf63 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddaddf63 Branch: refs/heads/cassandra-2.1 Commit: ddaddf636c20a3b34a92c06a5f7a64d18e4171eb Parents: ce7bc6a c0ff52e Author: Jonathan Ellis Authored: Wed Feb 19 16:15:18 2014 -0600 Committer: Jonathan Ellis Committed: Wed Feb 19 16:15:18 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddaddf63/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ddaddf63/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------