You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/07/18 00:23:17 UTC
git commit: ACCUMULO-1577 committing Michael Berman's patch to 1.5
Updated Branches:
refs/heads/1.5.1-SNAPSHOT 7b6172309 -> 35c7591a3
ACCUMULO-1577 committing Michael Berman's patch to 1.5
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/35c7591a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/35c7591a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/35c7591a
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 35c7591a3c86f3518833efca1921dcded227e961
Parents: 7b61723
Author: Eric Newton <er...@gmail.com>
Authored: Wed Jul 17 18:23:17 2013 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Wed Jul 17 18:23:17 2013 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/start/classloader/AccumuloClassLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/35c7591a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
index 594ad8f..478f4bc 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
@@ -68,7 +68,7 @@ public class AccumuloClassLoader {
String configFile = System.getProperty("org.apache.accumulo.config.file", "accumulo-site.xml");
if (System.getenv("ACCUMULO_CONF_DIR") != null) {
// accumulo conf dir should be set
- SITE_CONF = System.getenv("ACCUMULO_CONF_DIR");
+ SITE_CONF = System.getenv("ACCUMULO_CONF_DIR") + "/" + configFile;
} else if (System.getenv("ACCUMULO_HOME") != null) {
// if no accumulo conf dir, try accumulo home default
SITE_CONF = System.getenv("ACCUMULO_HOME") + "/conf/" + configFile;