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/17 21:34:11 UTC
git commit: ACCUMULO-1577 committing Michael Berman's patch
Updated Branches:
refs/heads/master 048b308d9 -> f8b9145d4
ACCUMULO-1577 committing Michael Berman's patch
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f8b9145d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f8b9145d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f8b9145d
Branch: refs/heads/master
Commit: f8b9145d4c9feb12de9093a75720697f12d0b3b3
Parents: 048b308
Author: Eric Newton <er...@gmail.com>
Authored: Wed Jul 17 15:34:05 2013 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Wed Jul 17 15:34:05 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/f8b9145d/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 ccd85a6..a68ce0e 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
@@ -76,7 +76,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;