accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1346094 - in /accumulo/branches/1.4.1: ./ bin/config.sh src/ src/core/ src/server/
Date Mon, 04 Jun 2012 19:05:44 GMT
Author: ecn
Date: Mon Jun  4 19:05:43 2012
New Revision: 1346094

URL: http://svn.apache.org/viewvc?rev=1346094&view=rev
Log:
ACCUMULO-615 merge to 1.4.1 branch

Modified:
    accumulo/branches/1.4.1/   (props changed)
    accumulo/branches/1.4.1/bin/config.sh
    accumulo/branches/1.4.1/src/   (props changed)
    accumulo/branches/1.4.1/src/core/   (props changed)
    accumulo/branches/1.4.1/src/server/   (props changed)

Propchange: accumulo/branches/1.4.1/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4:r1346089

Modified: accumulo/branches/1.4.1/bin/config.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.4.1/bin/config.sh?rev=1346094&r1=1346093&r2=1346094&view=diff
==============================================================================
--- accumulo/branches/1.4.1/bin/config.sh (original)
+++ accumulo/branches/1.4.1/bin/config.sh Mon Jun  4 19:05:43 2012
@@ -52,7 +52,7 @@ fi
 if [ -z "$HADOOP_HOME" ]
 then
    HADOOP_HOME="`which hadoop`"
-   if [ -z "$HADOOP_HOME"]
+   if [ -z "$HADOOP_HOME" ]
    then
       echo "You must set HADOOP_HOME"
       exit 1
@@ -67,11 +67,6 @@ then
 fi
 export HADOOP_HOME
 
-if [ "`$HADOOP_HOME/bin/hadoop version 2>/dev/null | head -1 | cut -f 2 -d .`" != 20 ];
then
-    echo "Accumulo $ACCUMULO_VERSION requires Hadoop version 0.20.x"
-    exit 1
-fi
-
 if [ ! -f "$ACCUMULO_HOME/conf/masters" -o ! -f "$ACCUMULO_HOME/conf/slaves" ]
 then
     if [ ! -f "$ACCUMULO_HOME/conf/masters" -a ! -f "$ACCUMULO_HOME/conf/slaves" ]

Propchange: accumulo/branches/1.4.1/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1346089

Propchange: accumulo/branches/1.4.1/src/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/core:r1346089

Propchange: accumulo/branches/1.4.1/src/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/server:r1346089



Mime
View raw message