You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by jo...@apache.org on 2015/07/08 21:23:01 UTC

spark git commit: [HOTFIX] Fix style error introduced in e4313db38e81f6288f1704c22e17d0c6e81b4d75

Repository: spark
Updated Branches:
  refs/heads/branch-1.4 e4313db38 -> 898b0739e


[HOTFIX] Fix style error introduced in e4313db38e81f6288f1704c22e17d0c6e81b4d75


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/898b0739
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/898b0739
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/898b0739

Branch: refs/heads/branch-1.4
Commit: 898b0739ea9ab5669ca99fed05b4f9bdeb920d9f
Parents: e4313db
Author: Josh Rosen <jo...@databricks.com>
Authored: Wed Jul 8 12:22:18 2015 -0700
Committer: Josh Rosen <jo...@databricks.com>
Committed: Wed Jul 8 12:22:18 2015 -0700

----------------------------------------------------------------------
 yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/898b0739/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
----------------------------------------------------------------------
diff --git a/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala b/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
index cc0aa45..e33b822 100644
--- a/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
+++ b/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
@@ -339,8 +339,8 @@ private[spark] class Client(
       require(addDistributedUri(file.toURI()))
       val destPath = copyFileToRemote(dst, new Path(file.toURI()), replication)
       val destFs = FileSystem.get(destPath.toUri(), hadoopConf)
-      distCacheMgr.addResource(destFs, hadoopConf, destPath, localResources, LocalResourceType.ARCHIVE,
-        LOCALIZED_HADOOP_CONF_DIR, statCache, appMasterOnly = true)
+      distCacheMgr.addResource(destFs, hadoopConf, destPath, localResources,
+        LocalResourceType.ARCHIVE, LOCALIZED_HADOOP_CONF_DIR, statCache, appMasterOnly = true)
     }
 
     /**


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org