Revert a few more changes

xiliu82 · Aug 19, 2014 · c37e08d · c37e08d
1 parent a396eda
commit c37e08d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/.rat-excludes b/.rat-excludes
@@ -30,7 +30,6 @@ sorttable.js
 .*json
 .*data
 .*log
-.*conf
 cloudpickle.py
 join.py
 SparkExprTyper.scala

diff --git a/bin/pyspark b/bin/pyspark
@@ -23,8 +23,7 @@ FWDIR="$(cd `dirname $0`/..; pwd)"
 # Export this as SPARK_HOME
 export SPARK_HOME="$FWDIR"
 
-# Load utility functions
-. "$FWDIR/bin/utils.sh"
+source $FWDIR/bin/utils.sh
 
 SCALA_VERSION=2.10
 

diff --git a/bin/spark-shell b/bin/spark-shell
@@ -41,8 +41,7 @@ if [[ "$@" = *--help ]] || [[ "$@" = *-h ]]; then
   usage
 fi
 
-# Load utility functions
-. "$FWDIR/bin/utils.sh"
+source $FWDIR/bin/utils.sh
 
 SUBMIT_USAGE_FUNCTION=usage
 gatherSparkSubmitOpts "$@"

diff --git a/bin/spark-submit b/bin/spark-submit
@@ -42,9 +42,9 @@ DEFAULT_PROPERTIES_FILE="$SPARK_HOME/conf/spark-defaults.conf"
 PROPERTIES_FILE=${PROPERTIES_FILE:-"$DEFAULT_PROPERTIES_FILE"}
 
 # For client mode, the driver will be launched in the same JVM that launches
-# SparkSubmit, so we to read the properties file for any class paths, library
-# paths, java options and memory early on. Otherwise, it will be too late by
-# the time the JVM has started.
+# SparkSubmit, so we need to read the properties file for any extra class paths,
+# library paths, java options and memory early on. Otherwise, it will be too
+# late by the time the JVM has started.
 
 if [ "$DEPLOY_MODE" == "client" ]; then
   if [ -n "$DRIVER_MEMORY" ]; then
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,6 @@ sorttable.js @@
     .*json
     .*data
     .*log
-    .*conf
     cloudpickle.py
     join.py
     SparkExprTyper.scala
@@ Expand Down @@