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:05 UTC
[1/3] git commit: ACCUMULO-1870 Functional tests don't configure
Monitor log
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 743d64b29 -> 050e7e25d
ACCUMULO-1870 Functional tests don't configure Monitor log
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1e96138b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1e96138b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1e96138b
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 1e96138bb544e02829474011df850d5f28f299e6
Parents: d059d00
Author: ofishel <ry...@cloudera.com>
Authored: Mon Nov 11 06:50:12 2013 -0800
Committer: Josh Elser <el...@apache.org>
Committed: Wed Nov 13 10:37:32 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/1e96138b/test/system/auto/TestUtils.py
----------------------------------------------------------------------
diff --git a/test/system/auto/TestUtils.py b/test/system/auto/TestUtils.py
index c10c090..b70677a 100755
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@ -52,7 +52,7 @@ 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/lib/[^.].$ACCUMULO_VERSION.jar, $ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar,"
"$HADOOP_HOME/conf,$HADOOP_HOME/[^.].*.jar, $HADOOP_HOME/lib/[^.].*.jar")
[2/3] git commit: Merge remote-tracking branch
'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by el...@apache.org.
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')
[3/3] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-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/050e7e25
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/050e7e25
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/050e7e25
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 050e7e25db3fd762f65817768a64df4934ec80a7
Parents: 743d64b 7551b55
Author: Josh Elser <el...@apache.org>
Authored: Wed Nov 13 10:41:48 2013 -0800
Committer: Josh Elser <el...@apache.org>
Committed: Wed Nov 13 10:41:48 2013 -0800
----------------------------------------------------------------------
----------------------------------------------------------------------