You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2014/01/31 00:29:20 UTC
[1/4] git commit: ACCUMULO-2220 supporting ACCUMULO_CONF_DIR in
test/system/bench
Updated Branches:
refs/heads/master e98c089b4 -> ec745ff04
ACCUMULO-2220 supporting ACCUMULO_CONF_DIR in test/system/bench
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d8977c8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d8977c8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4d8977c8
Branch: refs/heads/master
Commit: 4d8977c891017701d4ff2873439fc884b4a4ea57
Parents: 9bff89f
Author: John Vines <vi...@apache.org>
Authored: Thu Jan 30 18:27:31 2014 -0500
Committer: John Vines <vi...@apache.org>
Committed: Thu Jan 30 18:27:31 2014 -0500
----------------------------------------------------------------------
test/system/bench/lib/path.py | 7 +++++++
test/system/bench/lib/slaves.py | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d8977c8/test/system/bench/lib/path.py
----------------------------------------------------------------------
diff --git a/test/system/bench/lib/path.py b/test/system/bench/lib/path.py
index 6dc4009..22b8309 100755
--- a/test/system/bench/lib/path.py
+++ b/test/system/bench/lib/path.py
@@ -18,10 +18,17 @@ import os
HERE = os.path.dirname(__file__)
ACCUMULO_HOME = os.getenv('ACCUMULO_HOME')
+if not os.getenv('ACCUMULO_CONF_DIR'):
+ ACCUMULO_CONF_DIR = ACCUMULO_HOME+'/conf'
+else:
+ ACCUMULO_CONF_DIR = os.getenv('ACCUMULO_CONF_DIR')
def accumulo(*args):
return os.path.join(ACCUMULO_HOME, *args)
+def accumuloConf(*args):
+ return os.path.join(ACCUMULO_CONF_DIR, *args)
+
def accumuloJar():
import glob
options = (glob.glob(accumulo('lib', 'accumulo*.jar')) +
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d8977c8/test/system/bench/lib/slaves.py
----------------------------------------------------------------------
diff --git a/test/system/bench/lib/slaves.py b/test/system/bench/lib/slaves.py
index 8fb49f2..451d603 100755
--- a/test/system/bench/lib/slaves.py
+++ b/test/system/bench/lib/slaves.py
@@ -24,7 +24,7 @@ from lib.path import accumulo
from lib.options import log
def slaveNames():
- return [s.strip() for s in open(accumulo('conf', 'slaves'))]
+ return [s.strip() for s in open(accumuloConf('slaves'))]
def runEach(commandMap):
result = {}
[2/4] git commit: Merge remote-tracking branch
'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by vi...@apache.org.
Merge remote-tracking branch 'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b33559c7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b33559c7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b33559c7
Branch: refs/heads/master
Commit: b33559c71eedb984b80fe70272e4035099a922dc
Parents: 5fe2ccc 4d8977c
Author: John Vines <vi...@apache.org>
Authored: Thu Jan 30 18:28:22 2014 -0500
Committer: John Vines <vi...@apache.org>
Committed: Thu Jan 30 18:28:22 2014 -0500
----------------------------------------------------------------------
test/system/bench/lib/path.py | 7 +++++++
test/system/bench/lib/slaves.py | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[4/4] git commit: Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'
Posted by vi...@apache.org.
Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ec745ff0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec745ff0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ec745ff0
Branch: refs/heads/master
Commit: ec745ff040100d6bf6f143200c989508c8a16030
Parents: e98c089 aff072d
Author: John Vines <vi...@apache.org>
Authored: Thu Jan 30 18:29:16 2014 -0500
Committer: John Vines <vi...@apache.org>
Committed: Thu Jan 30 18:29:16 2014 -0500
----------------------------------------------------------------------
test/system/bench/lib/path.py | 7 +++++++
test/system/bench/lib/slaves.py | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/4] git commit: Merge remote-tracking branch
'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by vi...@apache.org.
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/aff072d2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aff072d2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aff072d2
Branch: refs/heads/master
Commit: aff072d24282e40a5d9823ed3fca6340b60420cb
Parents: d497b80 b33559c
Author: John Vines <vi...@apache.org>
Authored: Thu Jan 30 18:28:57 2014 -0500
Committer: John Vines <vi...@apache.org>
Committed: Thu Jan 30 18:28:57 2014 -0500
----------------------------------------------------------------------
test/system/bench/lib/path.py | 7 +++++++
test/system/bench/lib/slaves.py | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------