You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/02/28 20:06:43 UTC
svn commit: r1451294 - in /accumulo/trunk: ./ assemble/ bin/stop-all.sh
core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
server/ src/
Author: kturner
Date: Thu Feb 28 19:06:42 2013
New Revision: 1451294
URL: http://svn.apache.org/r1451294
Log:
ACCUMULO-995 Applied patch from Michael Allen that fixes passing options to stop-all.sh
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/bin/stop-all.sh
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1451249-1451265,1451267-1451293
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1451019-1451265,1451267-1451293
Modified: accumulo/trunk/bin/stop-all.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/stop-all.sh?rev=1451294&r1=1451293&r2=1451294&view=diff
==============================================================================
--- accumulo/trunk/bin/stop-all.sh (original)
+++ accumulo/trunk/bin/stop-all.sh Thu Feb 28 19:06:42 2013
@@ -21,7 +21,7 @@ bin=`cd "$bin"; pwd`
. "$bin"/config.sh
-${bin}/accumulo admin stopAll "$@"
+${bin}/accumulo admin "$@" stopAll
if [ $? -ne 0 ]; then
echo 'Invalid password or unable to connect to the master'
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1451249-1451265,1451267-1451293
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1451019-1451265,1451267-1451293
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1451019-1451265,1451267-1451293
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1451019-1451265,1451267-1451293
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1451019-1451265,1451267-1451293
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1451019-1451265,1451267-1451293