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 6C20E105C2 for ; Wed, 15 Jan 2014 22:04:48 +0000 (UTC) Received: (qmail 69519 invoked by uid 500); 15 Jan 2014 22:04:24 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 69424 invoked by uid 500); 15 Jan 2014 22:04:23 -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 69285 invoked by uid 99); 15 Jan 2014 22:04:21 -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, 15 Jan 2014 22:04:21 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C0D808347F3; Wed, 15 Jan 2014 22:04:20 +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: Wed, 15 Jan 2014 22:04:25 -0000 Message-Id: <8cde2603221f485bafe393e24e420f50@git.apache.org> In-Reply-To: <8a9b167a5134428595fe97e900830d11@git.apache.org> References: <8a9b167a5134428595fe97e900830d11@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] 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/6abe16d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6abe16d3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6abe16d3 Branch: refs/heads/trunk Commit: 6abe16d36733363709d478a1ab65b9d1ff0cb6a1 Parents: 8b09061 27488a5 Author: Brandon Williams Authored: Wed Jan 15 16:02:24 2014 -0600 Committer: Brandon Williams Committed: Wed Jan 15 16:02:24 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6abe16d3/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------