diff options
| author | Marcelo Vanzin <vanzin@cloudera.com> | 2014-04-22 14:28:41 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-04-22 14:28:49 -0700 |
| commit | b6ba546510c236f77be5d9229d6908f34c25e5d0 (patch) | |
| tree | fc3b80a998b7c3a282cc81e8b62796c2bceed855 /yarn | |
| parent | 54c96c2343dff6e6defe4e2ad576ab8a82d45140 (diff) | |
| download | spark-b6ba546510c236f77be5d9229d6908f34c25e5d0.tar.gz spark-b6ba546510c236f77be5d9229d6908f34c25e5d0.tar.bz2 spark-b6ba546510c236f77be5d9229d6908f34c25e5d0.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.
(cherry picked from commit 0ea0b1a2d66044af97ab84bf3014ff8dfe91fee4)
Signed-off-by: Patrick Wendell <pwendell@gmail.com>
Diffstat (limited to 'yarn')
| -rw-r--r-- | yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala | 3 |
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) |