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 3A9231049F for ; Fri, 24 Jan 2014 18:53:12 +0000 (UTC) Received: (qmail 53605 invoked by uid 500); 24 Jan 2014 18:53:08 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 53519 invoked by uid 500); 24 Jan 2014 18:53:06 -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 53438 invoked by uid 99); 24 Jan 2014 18:53:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jan 2014 18:53:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 379E3904FBC; Fri, 24 Jan 2014 18:53:05 +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: Fri, 24 Jan 2014 18:53:12 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [8/8] 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/e488e587 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e488e587 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e488e587 Branch: refs/heads/trunk Commit: e488e5879dce41518a217eb9de1978149b60867c Parents: b38a905 a169863 Author: Brandon Williams Authored: Fri Jan 24 12:51:10 2014 -0600 Committer: Brandon Williams Committed: Fri Jan 24 12:51:10 2014 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/service/StorageService.java | 3 ++- .../cassandra/service/LeaveAndBootstrapTest.java | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e488e587/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e488e587/test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java ----------------------------------------------------------------------