From 0ea0b1a2d66044af97ab84bf3014ff8dfe91fee4 Mon Sep 17 00:00:00 2001
From: Marcelo Vanzin <vanzin@cloudera.com>
Date: Tue, 22 Apr 2014 14:28:41 -0700
Subject: [PATCH] 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.
---
.../main/scala/org/apache/spark/deploy/yarn/ClientBase.scala | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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)
--
GitLab