Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 88BB61750C for ; Wed, 28 Jan 2015 19:12:10 +0000 (UTC) Received: (qmail 66668 invoked by uid 500); 28 Jan 2015 19:12:11 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 66624 invoked by uid 500); 28 Jan 2015 19:12:11 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 66550 invoked by uid 99); 28 Jan 2015 19:12:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Jan 2015 19:12:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C712FE0D5F; Wed, 28 Jan 2015 19:12:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Wed, 28 Jan 2015 19:12:14 -0000 Message-Id: <51c0992a2be847c4af5e1ef02ca5d2ba@git.apache.org> In-Reply-To: <92775e30aea34284bdcb8ac9a9117c44@git.apache.org> References: <92775e30aea34284bdcb8ac9a9117c44@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/8] accumulo git commit: ACCUMULO-2696 revert whitespace changes ACCUMULO-2696 revert whitespace changes Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b2f7e93c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b2f7e93c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b2f7e93c Branch: refs/heads/master Commit: b2f7e93cf1779d46326391ac1a8bfa19202e6d14 Parents: c7c616e Author: Eric C. Newton Authored: Tue Jan 27 16:32:55 2015 -0500 Committer: Eric C. Newton Committed: Tue Jan 27 16:32:55 2015 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/master/Master.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b2f7e93c/server/master/src/main/java/org/apache/accumulo/master/Master.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java b/server/master/src/main/java/org/apache/accumulo/master/Master.java index 982b647..2989608 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/Master.java +++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java @@ -801,14 +801,14 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt if (count == 0) setMasterState(MasterState.UNLOAD_METADATA_TABLETS); } - break; + break; case UNLOAD_METADATA_TABLETS: { int count = assignedOrHosted(METADATA_TABLE_ID); log.debug(String.format("There are %d metadata tablets assigned or hosted", count)); if (count == 0) setMasterState(MasterState.UNLOAD_ROOT_TABLET); } - break; + break; case UNLOAD_ROOT_TABLET: { int count = assignedOrHosted(METADATA_TABLE_ID); if (count > 0) { @@ -835,7 +835,7 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt setMasterState(MasterState.STOP); } } - break; + break; default: break; }