accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1428055 - in /accumulo/trunk: ./ assemble/ core/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ packages/deb/accumulo-native/ packages/deb/accumulo/ server/ src/
Date Wed, 02 Jan 2013 21:18:44 GMT
Author: vines
Date: Wed Jan  2 21:18:43 2013
New Revision: 1428055

URL: http://svn.apache.org/viewvc?rev=1428055&view=rev
Log:
ACCUMULO-788 - merging 1428054

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/core/   (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/packages/deb/accumulo-native/postinst
    accumulo/trunk/packages/deb/accumulo/postinst
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1428054

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/assemble:r1428054

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/core:r1428054

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1428054

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1428054

Modified: accumulo/trunk/packages/deb/accumulo-native/postinst
URL: http://svn.apache.org/viewvc/accumulo/trunk/packages/deb/accumulo-native/postinst?rev=1428055&r1=1428054&r2=1428055&view=diff
==============================================================================
--- accumulo/trunk/packages/deb/accumulo-native/postinst (original)
+++ accumulo/trunk/packages/deb/accumulo-native/postinst Wed Jan  2 21:18:43 2013
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 # postinst script for Apache Accumulo native libraries
-if [ -z $JAVA_HOME -o ! -f $JAVA_HOME/jre/bin/ ] ; then
+if [ -z "$JAVA_HOME" -o ! -f "$JAVA_HOME/jre/bin/" ] ; then
   JAVA_HOME=`readlink -f /usr/bin/java`
   JAVA_HOME=`dirname $JAVA_HOME`
   JAVA_HOME=`cd $JAVA_HOME/../../; pwd`

Modified: accumulo/trunk/packages/deb/accumulo/postinst
URL: http://svn.apache.org/viewvc/accumulo/trunk/packages/deb/accumulo/postinst?rev=1428055&r1=1428054&r2=1428055&view=diff
==============================================================================
--- accumulo/trunk/packages/deb/accumulo/postinst (original)
+++ accumulo/trunk/packages/deb/accumulo/postinst Wed Jan  2 21:18:43 2013
@@ -26,7 +26,7 @@ mkdir -p /var/lib/accumulo/walogs
 ln -fs /var/log/accumulo/logs /usr/lib/accumulo/logs 
 ln -fs /var/lib/accumulo/walogs /usr/lib/accumulo/walogs 
 
-if [ -z $JAVA_HOME -o ! -f $JAVA_HOME/jre/bin/ ] ; then
+if [ -z "$JAVA_HOME" -o ! -f "$JAVA_HOME/jre/bin/" ] ; then
   JAVA_HOME=`readlink -f /usr/bin/java`
   JAVA_HOME=`dirname $JAVA_HOME`
   JAVA_HOME=`cd $JAVA_HOME/../../; pwd`

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/server:r1428054

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/src:r1428054



Mime
View raw message