You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/05/07 21:21:36 UTC
spark git commit: [SPARK-7399] [SPARK CORE] Fixed compilation error
in scala 2.11
Repository: spark
Updated Branches:
refs/heads/master 074d75d4c -> 0c33bf817
[SPARK-7399] [SPARK CORE] Fixed compilation error in scala 2.11
scala has deterministic naming-scheme for the generated methods which return default arguments . here one of the default argument of overloaded method has to be removed
Author: Tijo Thomas <ti...@gmail.com>
Closes #5966 from tijoparacka/fix_compilation_error_in_scala2.11 and squashes the following commits:
c90bba8 [Tijo Thomas] Fixed compilation error in scala 2.11
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0c33bf81
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0c33bf81
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0c33bf81
Branch: refs/heads/master
Commit: 0c33bf817cef457873007959f3539f93f907dccd
Parents: 074d75d
Author: Tijo Thomas <ti...@gmail.com>
Authored: Thu May 7 12:21:09 2015 -0700
Committer: Andrew Or <an...@databricks.com>
Committed: Thu May 7 12:21:26 2015 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/rdd/RDDOperationScope.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/0c33bf81/core/src/main/scala/org/apache/spark/rdd/RDDOperationScope.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/rdd/RDDOperationScope.scala b/core/src/main/scala/org/apache/spark/rdd/RDDOperationScope.scala
index 537b56b..9440d45 100644
--- a/core/src/main/scala/org/apache/spark/rdd/RDDOperationScope.scala
+++ b/core/src/main/scala/org/apache/spark/rdd/RDDOperationScope.scala
@@ -111,7 +111,7 @@ private[spark] object RDDOperationScope {
private[spark] def withScope[T](
sc: SparkContext,
name: String,
- allowNesting: Boolean = false)(body: => T): T = {
+ allowNesting: Boolean)(body: => T): T = {
// Save the old scope to restore it later
val scopeKey = SparkContext.RDD_SCOPE_KEY
val noOverrideKey = SparkContext.RDD_SCOPE_NO_OVERRIDE_KEY
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org