You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@mahout.apache.org by gs...@apache.org on 2011/10/06 20:32:13 UTC

svn commit: r1179752 - /mahout/trunk/bin/mahout

Author: gsingers
Date: Thu Oct  6 18:32:13 2011
New Revision: 1179752

URL: http://svn.apache.org/viewvc?rev=1179752&view=rev
Log:
merge

Modified:
    mahout/trunk/bin/mahout

Modified: mahout/trunk/bin/mahout
URL: http://svn.apache.org/viewvc/mahout/trunk/bin/mahout?rev=1179752&r1=1179751&r2=1179752&view=diff
==============================================================================
--- mahout/trunk/bin/mahout (original)
+++ mahout/trunk/bin/mahout Thu Oct  6 18:32:13 2011
@@ -210,7 +210,11 @@ if [ "$HADOOP_HOME" = "" ] || [ "$MAHOUT
       echo $CLASSPATH
       ;;
     (*)
+<<<<<<< HEAD
       CLASSPATH=$CLASSPATH exec "$JAVA" $JAVA_HEAP_MAX $MAHOUT_OPTS $CLASS "$@"
+=======
+      exec "$JAVA" $JAVA_HEAP_MAX $MAHOUT_OPTS -classpath "$CLASSPATH" $CLASS "$@"
+>>>>>>> b2289f420c0702f4ceeb5e1488c0977cd70f5f89
     esac
 else
   echo "Running on hadoop, using HADOOP_HOME=$HADOOP_HOME"