diff options
author | Andrew xia <junluan.xia@intel.com> | 2013-10-12 14:34:14 +0800 |
---|---|---|
committer | Andrew xia <junluan.xia@intel.com> | 2013-10-12 14:34:14 +0800 |
commit | 52ccf4f859d92ed9e86d3720a983ac2c4a1c23bf (patch) | |
tree | 0917110e4f0df8478a5c7de235337aa2879bb7b0 /core | |
parent | cc37b3151cb606ecf1c35865202dc2a08741281c (diff) | |
download | spark-52ccf4f859d92ed9e86d3720a983ac2c4a1c23bf.tar.gz spark-52ccf4f859d92ed9e86d3720a983ac2c4a1c23bf.tar.bz2 spark-52ccf4f859d92ed9e86d3720a983ac2c4a1c23bf.zip |
deprecate "spark" script and SPAKR_CLASSPATH environment variable
Diffstat (limited to 'core')
-rw-r--r-- | core/pom.xml | 1 | ||||
-rw-r--r-- | core/src/main/scala/org/apache/spark/SparkContext.scala | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/core/pom.xml b/core/pom.xml index 9c2d6046a9..8359fefdb4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -226,7 +226,6 @@ <environmentVariables> <SPARK_HOME>${basedir}/..</SPARK_HOME> <SPARK_TESTING>1</SPARK_TESTING> - <SPARK_CLASSPATH>${spark.classpath}</SPARK_CLASSPATH> </environmentVariables> </configuration> </plugin> diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala index 912ce752fb..ce7c4feaf6 100644 --- a/core/src/main/scala/org/apache/spark/SparkContext.scala +++ b/core/src/main/scala/org/apache/spark/SparkContext.scala @@ -132,7 +132,7 @@ class SparkContext( // Environment variables to pass to our executors private[spark] val executorEnvs = HashMap[String, String]() // Note: SPARK_MEM is included for Mesos, but overwritten for standalone mode in ExecutorRunner - for (key <- Seq("SPARK_CLASSPATH", "SPARK_LIBRARY_PATH", "SPARK_JAVA_OPTS", "SPARK_TESTING")) { + for (key <- Seq("SPARK_LIBRARY_PATH", "SPARK_JAVA_OPTS", "SPARK_TESTING")) { val value = System.getenv(key) if (value != null) { executorEnvs(key) = value |