From c37e08db49200912214681685b1f7ed08b524403 Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Mon, 18 Aug 2014 19:05:56 -0700 Subject: [PATCH] Revert a few more changes --- .rat-excludes | 1 - bin/pyspark | 3 +-- bin/spark-shell | 3 +-- bin/spark-submit | 6 +++--- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.rat-excludes b/.rat-excludes index 3c2451103e4b6..eaefef1b0aa2e 100644 --- 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 index 35a20ae4fcb2b..01d42025c978e 100755 --- 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 index d3381179d8bca..e0228e1ffe5e4 100755 --- 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 index c8a253a3f26ff..b26475e743a8c 100755 --- 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