You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ad...@apache.org on 2014/04/25 23:17:53 UTC
git commit: SPARK-1607. HOTFIX: Fix syntax adapting Int result to
Short
Repository: spark
Updated Branches:
refs/heads/master 8aaef5c75 -> df6d81425
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 <so...@cloudera.com>
Closes #556 from srowen/SPARK-1607.2 and squashes the following commits:
e3fe7a3 [Sean Owen] Fix syntax adapting Int result to Short
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/df6d8142
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/df6d8142
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/df6d8142
Branch: refs/heads/master
Commit: df6d81425bf3b8830988288069f6863de873aee2
Parents: 8aaef5c
Author: Sean Owen <so...@cloudera.com>
Authored: Fri Apr 25 14:17:38 2014 -0700
Committer: Aaron Davidson <aa...@databricks.com>
Committed: Fri Apr 25 14:17:38 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/df6d8142/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() = {