Repository: spark Updated Branches: refs/heads/branch-1.0 54c96c234 -> b6ba54651
Fix compilation on Hadoop 2.4.x. Author: Marcelo Vanzin <[email protected]> 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 <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b6ba5465 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b6ba5465 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b6ba5465 Branch: refs/heads/branch-1.0 Commit: b6ba546510c236f77be5d9229d6908f34c25e5d0 Parents: 54c96c2 Author: Marcelo Vanzin <[email protected]> Authored: Tue Apr 22 14:28:41 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Tue Apr 22 14:28:49 2014 -0700 ---------------------------------------------------------------------- .../src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/b6ba5465/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala ---------------------------------------------------------------------- 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 c00b636..d264ecb 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)
