git commit: ACCUMULO-1634 Improve stop-all messages

[ct...@apache.org]

Updated Branches:
  refs/heads/master 0df5081d0 -> d0fe7e60a


ACCUMULO-1634 Improve stop-all messages


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

Branch: refs/heads/master
Commit: d0fe7e60aca3cb77597a46a81164c29518ebb2f2
Parents: 0df5081
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Aug 8 11:33:06 2013 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Aug 8 11:33:06 2013 -0400

----------------------------------------------------------------------
 bin/stop-all.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d0fe7e60/bin/stop-all.sh
----------------------------------------------------------------------
diff --git a/bin/stop-all.sh b/bin/stop-all.sh
index 348d067..30c00b7 100755
--- a/bin/stop-all.sh
+++ b/bin/stop-all.sh
@@ -33,13 +33,14 @@ ${bin}/accumulo admin "$@" stopAll
 
 if [ $? -ne 0 ]; then
    echo "Invalid password or unable to connect to the master"
-   echo "Press Ctrl-C to cancel now, or force shutdown in 15 seconds"
+   echo "Initiating forced shutdown in 15 seconds (Ctrl-C to abort)"
    sleep 10
+   echo "Initiating forced shutdown in  5 seconds (Ctrl-C to abort)"
 else
    echo "Accumulo shut down cleanly"
+   echo "Utilities and unresponsive servers will shut down in 5 seconds (Ctrl-C to abort)"
 fi
 
-echo "Utilities and unresponsive servers will be shut down in 5 seconds"
 sleep 5
 
 #look for master and gc processes not killed by 'admin stopAll'