Author: ecn
Date: Mon Jun 4 19:04:36 2012
New Revision: 1346093
URL: http://svn.apache.org/viewvc?rev=1346093&view=rev
Log:
ACCUMULO-615 merge to 1.3.6 branch
Modified:
accumulo/branches/1.3.6/ (props changed)
accumulo/branches/1.3.6/bin/config.sh
Propchange: accumulo/branches/1.3.6/
------------------------------------------------------------------------------
Reverse-merged /incubator/accumulo/branches/1.3:r1209653
Merged /accumulo/branches/1.3:r1346090
Merged /accumulo/branches/1.4:r1346089
Modified: accumulo/branches/1.3.6/bin/config.sh
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.3.6/bin/config.sh?rev=1346093&r1=1346092&r2=1346093&view=diff
==============================================================================
--- accumulo/branches/1.3.6/bin/config.sh (original)
+++ accumulo/branches/1.3.6/bin/config.sh Mon Jun 4 19:04:36 2012
@@ -63,11 +63,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" ]
