You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2015/05/22 02:54:43 UTC
[13/14] accumulo git commit: Merge branch '1.6' into 1.7
Merge branch '1.6' into 1.7
Conflicts:
assemble/bin/accumulo
assemble/bin/stop-here.sh
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/acd8a631
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/acd8a631
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/acd8a631
Branch: refs/heads/master
Commit: acd8a6319a943e19c2dac58fe5a3234175e1326f
Parents: 81fdad8 53b9861
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu May 21 20:51:37 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu May 21 20:51:37 2015 -0400
----------------------------------------------------------------------
assemble/bin/accumulo | 1 -
assemble/bin/stop-here.sh | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/acd8a631/assemble/bin/accumulo
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/acd8a631/assemble/bin/stop-here.sh
----------------------------------------------------------------------
diff --cc assemble/bin/stop-here.sh
index fb5bb7d,49defa9..294f2bc
--- a/assemble/bin/stop-here.sh
+++ b/assemble/bin/stop-here.sh
@@@ -48,11 -50,11 +48,11 @@@ els
fi
for signal in TERM KILL; do
- for svc in tserver gc master monitor logger tracer; do
+ for svc in tserver gc master monitor tracer; do
- PID=$(ps -ef | egrep ${ACCUMULO} | grep "Main $svc" | grep -v grep | grep -v stop-here.sh | awk '{print $2}' | head -1)
- if [ ! -z $PID ]; then
+ PID=$(ps -ef | egrep "${ACCUMULO}" | grep "Main $svc" | grep -v grep | grep -v stop-here.sh | awk '{print $2}' | head -1)
+ if [[ -n $PID ]]; then
echo "Stopping ${svc} on ${HOSTNAME} with signal ${signal}"
- kill -s ${signal} ${PID}
+ kill -s ${signal} "${PID}"
fi
done
done