accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [5/7] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Date Sat, 07 Dec 2013 04:16:15 GMT
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	test/system/continuous/stop-agitator.sh


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9f9c0426
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9f9c0426
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9f9c0426

Branch: refs/heads/master
Commit: 9f9c0426ec00a9076ffd8f8f84f4f1d21869f914
Parents: bc0ce60 19a48da
Author: Josh Elser <elserj@apache.org>
Authored: Fri Dec 6 23:13:01 2013 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Dec 6 23:13:01 2013 -0500

----------------------------------------------------------------------
 test/system/continuous/stop-agitator.sh | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/9f9c0426/test/system/continuous/stop-agitator.sh
----------------------------------------------------------------------
diff --cc test/system/continuous/stop-agitator.sh
index 3d64e2d,b853a55..8ce448e
--- a/test/system/continuous/stop-agitator.sh
+++ b/test/system/continuous/stop-agitator.sh
@@@ -17,14 -18,5 +17,10 @@@
  CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
  . $CONTINUOUS_CONF_DIR/continuous-env.sh
  
 -pkill -f agitator.pl
 +# Try to use sudo when we wouldn't normally be able to kill the processes
 +if [[ ("`whoami`" != "root") && ("`whoami`" != $ACCUMULO_USER) ]];  then
 +  sudo -u $ACCUMULO_USER pkill -f agitator.pl
 +else
 +  pkill -f agitator.pl
 +fi
  
- if ${AGITATE_HDFS:-false} ; then
-   pkill -f hdfs-agitator.pl
- fi
- 


Mime
View raw message