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 2012/03/29 18:19:34 UTC

svn commit: r1306957 - in /accumulo/trunk: ./ bin/start-server.sh

Author: vines
Date: Thu Mar 29 16:19:34 2012
New Revision: 1306957

URL: http://svn.apache.org/viewvc?rev=1306957&view=rev
Log:
ACCUMULO-503 - merged MIA then


Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/bin/start-server.sh

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4:r1306956

Modified: accumulo/trunk/bin/start-server.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/start-server.sh?rev=1306957&r1=1306956&r2=1306957&view=diff
==============================================================================
--- accumulo/trunk/bin/start-server.sh (original)
+++ accumulo/trunk/bin/start-server.sh Thu Mar 29 16:19:34 2012
@@ -38,6 +38,7 @@ fi
 SLAVES=`wc -l < ${ACCUMULO_HOME}/conf/slaves`
 
 if [ $HOST == localhost ] 
+then
   PID=`ps -ef | egrep ${ACCUMULO_HOME}/.*/accumulo.*.jar | grep "Main $SERVICE" | grep -v grep | awk {'print $2'} | head -1`
 else
   PID=`$SSH $HOST ps -ef | egrep ${ACCUMULO_HOME}/.*/accumulo.*.jar | grep "Main $SERVICE" | grep -v grep | awk {'print $2'} | head -1`