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 9289C17DF1 for ; Thu, 16 Apr 2015 01:02:20 +0000 (UTC) Received: (qmail 7354 invoked by uid 500); 16 Apr 2015 01:02:20 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 7314 invoked by uid 500); 16 Apr 2015 01:02:20 -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 7297 invoked by uid 99); 16 Apr 2015 01:02:20 -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; Thu, 16 Apr 2015 01:02:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 55205E0922; Thu, 16 Apr 2015 01:02:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Thu, 16 Apr 2015 01:02:20 -0000 Message-Id: <5f3e276a656a42b8a3b9db4ede66f88a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] accumulo git commit: ACCUMULO-3730 Make getZooKeepersFromDir private again. Repository: accumulo Updated Branches: refs/heads/master d71dbe640 -> cf69821d5 ACCUMULO-3730 Make getZooKeepersFromDir private again. This method shouldn't leak into the public API. Add a comment to make sure it doesn't happen. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cf69821d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cf69821d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cf69821d Branch: refs/heads/master Commit: cf69821d5ff29ae552e7ac65bcef979a8c4dfafb Parents: 3ad1950 Author: Josh Elser Authored: Tue Apr 14 17:43:16 2015 -0400 Committer: Josh Elser Committed: Wed Apr 15 20:36:38 2015 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/minicluster/MiniAccumuloInstance.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/cf69821d/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java ---------------------------------------------------------------------- diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java index b94cb0b..095bae2 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloInstance.java @@ -50,7 +50,8 @@ public class MiniAccumuloInstance extends ZooKeeperInstance { } } - public static String getZooKeepersFromDir(File directory) throws FileNotFoundException { + // Keep this private to avoid bringing it into the public API + private static String getZooKeepersFromDir(File directory) throws FileNotFoundException { if (!directory.isDirectory()) throw new IllegalArgumentException("Not a directory " + directory.getPath()); File configFile = new File(new File(directory, "conf"), "accumulo-site.xml");