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 4E67511F18 for ; Wed, 30 Jul 2014 21:55:40 +0000 (UTC) Received: (qmail 40129 invoked by uid 500); 30 Jul 2014 21:55:39 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 40051 invoked by uid 500); 30 Jul 2014 21:55:39 -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 39781 invoked by uid 99); 30 Jul 2014 21:55:39 -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, 30 Jul 2014 21:55:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EEF669BA454; Wed, 30 Jul 2014 21:55:38 +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, 30 Jul 2014 21:55:43 -0000 Message-Id: <786c6d6e653f4f23b8088e60c48ed96a@git.apache.org> In-Reply-To: <8d81f600b8d64d4692c1e6c2c6e9aa3c@git.apache.org> References: <8d81f600b8d64d4692c1e6c2c6e9aa3c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0 Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08fd11dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08fd11dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08fd11dc Branch: refs/heads/cassandra-2.1.0 Commit: 08fd11dc1dd37079fcc265c5a5a048910f699f76 Parents: 948ae01 b40cb05 Author: Brandon Williams Authored: Wed Jul 30 16:54:49 2014 -0500 Committer: Brandon Williams Committed: Wed Jul 30 16:54:49 2014 -0500 ---------------------------------------------------------------------- .../cassandra/service/StorageService.java | 45 +------------------- 1 file changed, 2 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/08fd11dc/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------