From b9a71ebfd5dc0df2b9d34852c6902bc01a0b8be0 Mon Sep 17 00:00:00 2001
From: Albert Chu <chu11@llnl.gov>
Date: Mon, 21 Apr 2014 16:26:29 -0700
Subject: [PATCH] Add conf dir to CLASSPATH dependent on whether SPARK_CONF_DIR
 is set or not.

---
 bin/compute-classpath.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/compute-classpath.sh b/bin/compute-classpath.sh
index 2a2bb376fd71..13a71d1c31d8 100755
--- a/bin/compute-classpath.sh
+++ b/bin/compute-classpath.sh
@@ -28,7 +28,11 @@ FWDIR="$(cd `dirname $0`/..; pwd)"
 . $FWDIR/bin/load-spark-env.sh
 
 # Build up classpath
-CLASSPATH="$SPARK_CLASSPATH:$FWDIR/conf"
+if [ "$SPARK_CONF_DIRX" != "X" ]; then
+  CLASSPATH="$SPARK_CLASSPATH:$SPARK_CONF_DIR"
+else
+  CLASSPATH="$SPARK_CLASSPATH:$FWDIR/conf"
+fi
 
 ASSEMBLY_DIR="$FWDIR/assembly/target/scala-$SCALA_VERSION"