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 D34A418502 for ; Sun, 31 May 2015 20:13:02 +0000 (UTC) Received: (qmail 2248 invoked by uid 500); 31 May 2015 20:13:02 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 2148 invoked by uid 500); 31 May 2015 20:13:02 -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 2091 invoked by uid 99); 31 May 2015 20:13:02 -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; Sun, 31 May 2015 20:13:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 74748E098C; Sun, 31 May 2015 20:13:02 +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: Sun, 31 May 2015 20:13:06 -0000 Message-Id: <4c44833550dc43d8af00ef650cd62b1b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/9] accumulo git commit: ACCUMULO-3873 Add ambari-installed client.conf location ACCUMULO-3873 Add ambari-installed client.conf location Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cc25f513 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cc25f513 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cc25f513 Branch: refs/heads/master Commit: cc25f5135fbb5ec20f01870de3c068596d98eb2f Parents: e7f93b6 Author: Josh Elser Authored: Sun May 31 01:08:05 2015 -0400 Committer: Josh Elser Committed: Sun May 31 16:12:23 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/client/ClientConfiguration.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/cc25f513/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java index 17ad10b..a71b7e1 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java +++ b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java @@ -180,6 +180,7 @@ public class ClientConfiguration extends CompositeConfiguration { clientConfPaths.add(System.getenv("ACCUMULO_HOME") + File.separator + "conf" + File.separator + GLOBAL_CONF_FILENAME); } clientConfPaths.add("/etc/accumulo/" + GLOBAL_CONF_FILENAME); + clientConfPaths.add("/etc/accumulo/conf/" + GLOBAL_CONF_FILENAME); } return clientConfPaths; }