You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2013/11/13 19:42:06 UTC
[2/3] git commit: Merge remote-tracking branch
'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Merge remote-tracking branch 'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
test/system/auto/TestUtils.py
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7551b553
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7551b553
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7551b553
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 7551b5533ca669db6201c3dc254fcb2ed04a0134
Parents: 20cbf24 1e96138
Author: Josh Elser <el...@apache.org>
Authored: Wed Nov 13 10:39:33 2013 -0800
Committer: Josh Elser <el...@apache.org>
Committed: Wed Nov 13 10:39:33 2013 -0800
----------------------------------------------------------------------
test/system/auto/TestUtils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7551b553/test/system/auto/TestUtils.py
----------------------------------------------------------------------
diff --cc test/system/auto/TestUtils.py
index df112c5,b70677a..32dc4b8
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@@ -48,32 -48,14 +48,32 @@@ else
ACCUMULO_CONF_DIR = os.path.join(ACCUMULO_HOME, 'conf')
SITE = "test-" + ID
-WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
-
LOG_PROPERTIES= os.path.join(ACCUMULO_CONF_DIR, 'log4j.properties')
LOG_GENERIC = os.path.join(ACCUMULO_CONF_DIR, 'generic_logger.xml')
- LOG_MONITOR = os.path.join(ACCUMULO_CONF_DIR, 'conf', 'monitor_logger.xml')
+ LOG_MONITOR = os.path.join(ACCUMULO_CONF_DIR, 'monitor_logger.xml')
+General_CLASSPATH = """
+$ACCUMULO_CONF_DIR,
+$ACCUMULO_HOME/server/target/classes/,
+ $ACCUMULO_HOME/core/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-core.jar,
+ $ACCUMULO_HOME/start/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-start.jar,
+ $ACCUMULO_HOME/fate/target/classes/,
+ $ACCUMULO_HOME/lib/accumulo-fate.jar,
+ $ACCUMULO_HOME/examples/simple/target/classes,
+ $ACCUMULO_HOME/lib/accumulo-examples-simple.jar,
+ $ACCUMULO_HOME/lib/[^.].*.jar,
+ $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+ $HADOOP_CONF_DIR,
+ $HADOOP_PREFIX/[^.].*.jar,
+ $HADOOP_PREFIX/lib/[^.].*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+"""
-General_CLASSPATH = ("$ACCUMULO_CONF_DIR,$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar, $ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar,"
-"$HADOOP_HOME/conf,$HADOOP_HOME/[^.].*.jar, $HADOOP_HOME/lib/[^.].*.jar")
log = logging.getLogger('test.auto')