Repository: accumulo Updated Branches: refs/heads/1.6 76c545bb3 -> cc25f5135 refs/heads/1.7 f7be66e69 -> 4815ec45a refs/heads/master f15a451d0 -> e88f64235
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/1.6 Commit: cc25f5135fbb5ec20f01870de3c068596d98eb2f Parents: e7f93b6 Author: Josh Elser <els...@apache.org> Authored: Sun May 31 01:08:05 2015 -0400 Committer: Josh Elser <els...@apache.org> 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; }
