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/12/05 05:51:48 UTC
[1/2] git commit: ACCUMULO-1967 Magitator should respect presence (or
lack) of a 'gc' file
Updated Branches:
refs/heads/1.5.1-SNAPSHOT c1fa5573c -> 0833f4fab
ACCUMULO-1967 Magitator should respect presence (or lack) of a 'gc' file
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6175d7a5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6175d7a5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6175d7a5
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 6175d7a51838b471b96ffbdee17f4b327bf3de0e
Parents: 36561a0
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 4 23:46:42 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 4 23:46:42 2013 -0500
----------------------------------------------------------------------
test/system/continuous/magitator.pl | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6175d7a5/test/system/continuous/magitator.pl
----------------------------------------------------------------------
diff --git a/test/system/continuous/magitator.pl b/test/system/continuous/magitator.pl
index 921c4d1..a40bfb2 100755
--- a/test/system/continuous/magitator.pl
+++ b/test/system/continuous/magitator.pl
@@ -60,7 +60,15 @@ while(1){
$cmd = "pssh -h $ACCUMULO_CONF_DIR/masters \"pkill -f '[ ]org.apache.accumulo.start.*master'\" < /dev/null";
print "$t $cmd\n";
system($cmd);
- $cmd = "pssh -h $ACCUMULO_CONF_DIR/masters \"pkill -f '[ ]org.apache.accumulo.start.*gc'\" < /dev/null";
+
+ $file = '';
+ if (-e "$ACCUMULO_CONF_DIR/gc") {
+ $file = 'gc';
+ } else {
+ $file = 'masters';
+ }
+
+ $cmd = "pssh -h $ACCUMULO_CONF_DIR/$file \"pkill -f '[ ]org.apache.accumulo.start.*gc'\" < /dev/null";
print "$t $cmd\n";
system($cmd);
}
[2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
test/system/continuous/magitator.pl
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0833f4fa
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0833f4fa
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0833f4fa
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 0833f4fab85951dca371afe87cf6cbabdf730161
Parents: c1fa557 6175d7a
Author: Josh Elser <el...@apache.org>
Authored: Wed Dec 4 23:51:04 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Dec 4 23:51:04 2013 -0500
----------------------------------------------------------------------
test/system/continuous/magitator.pl | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------