aboutsummaryrefslogtreecommitdiff
path: root/yarn
diff options
context:
space:
mode:
authorMarcelo Vanzin <vanzin@cloudera.com>2014-04-22 14:28:41 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-04-22 14:28:41 -0700
commit0ea0b1a2d66044af97ab84bf3014ff8dfe91fee4 (patch)
tree0c1e753c75ad7509ed6490085b6853014cb07552 /yarn
parent745e496c59cfece2fcd6120ecc366dcab07b293a (diff)
downloadspark-0ea0b1a2d66044af97ab84bf3014ff8dfe91fee4.tar.gz
spark-0ea0b1a2d66044af97ab84bf3014ff8dfe91fee4.tar.bz2
spark-0ea0b1a2d66044af97ab84bf3014ff8dfe91fee4.zip
Fix compilation on Hadoop 2.4.x.
Author: Marcelo Vanzin <vanzin@cloudera.com> Closes #483 from vanzin/yarn-2.4 and squashes the following commits: 0fc57d8 [Marcelo Vanzin] Fix compilation on Hadoop 2.4.x.
Diffstat (limited to 'yarn')
-rw-r--r--yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
index c00b63669c..d264ecbeaf 100644
--- a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
+++ b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
@@ -458,7 +458,8 @@ object ClientBase {
}
/** Add entry to the classpath. */
- def addClasspathEntry(path: String) = Apps.addToEnvironment(env, Environment.CLASSPATH.name, path)
+ def addClasspathEntry(path: String) = YarnSparkHadoopUtil.addToEnvironment(env,
+ Environment.CLASSPATH.name, path, File.pathSeparator)
/** Add entry to the classpath. Interpreted as a path relative to the working directory. */
def addPwdClasspathEntry(entry: String) = addClasspathEntry(Environment.PWD.$() + Path.SEPARATOR + entry)