spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject git commit: SPARK-1607. HOTFIX: Fix syntax adapting Int result to Short
Date Fri, 25 Apr 2014 21:19:06 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.0 a0912a802 -> 784b2a613


SPARK-1607. HOTFIX: Fix syntax adapting Int result to Short

Sorry folks. This should make the change for SPARK-1607 compile again. Verified this time
with the yarn build enabled.

Author: Sean Owen <sowen@cloudera.com>

Closes #556 from srowen/SPARK-1607.2 and squashes the following commits:

e3fe7a3 [Sean Owen] Fix syntax adapting Int result to Short

(cherry picked from commit df6d81425bf3b8830988288069f6863de873aee2)
Signed-off-by: Aaron Davidson <aaron@databricks.com>


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

Branch: refs/heads/branch-1.0
Commit: 784b2a613cb6b1ccffb6e1f9ca71bba65964f8cd
Parents: a0912a8
Author: Sean Owen <sowen@cloudera.com>
Authored: Fri Apr 25 14:17:38 2014 -0700
Committer: Aaron Davidson <aaron@databricks.com>
Committed: Fri Apr 25 14:18:58 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/spark/blob/784b2a61/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 eb95d78..f2be821 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
@@ -60,10 +60,10 @@ trait ClientBase extends Logging {
 
   // Staging directory is private! -> rwx--------
   val STAGING_DIR_PERMISSION: FsPermission =
-    FsPermission.createImmutable(Integer.parseInt("700", 8): Short)
+    FsPermission.createImmutable(Integer.parseInt("700", 8).toShort)
   // App files are world-wide readable and owner writable -> rw-r--r--
   val APP_FILE_PERMISSION: FsPermission =
-    FsPermission.createImmutable(Integer.parseInt("644", 8): Short)
+    FsPermission.createImmutable(Integer.parseInt("644", 8).toShort)
 
   // TODO(harvey): This could just go in ClientArguments.
   def validateArgs() = {


Mime
View raw message