You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by yh...@apache.org on 2016/01/27 23:02:00 UTC
spark git commit: [HOTFIX] Fix Scala 2.11 compilation
Repository: spark
Updated Branches:
refs/heads/master ef96cd3c5 -> d702f0c17
[HOTFIX] Fix Scala 2.11 compilation
by explicitly marking annotated parameters as vals (SI-8813).
Caused by #10835.
Author: Andrew Or <an...@databricks.com>
Closes #10955 from andrewor14/fix-scala211.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d702f0c1
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d702f0c1
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d702f0c1
Branch: refs/heads/master
Commit: d702f0c170d5c39df501e173813f8a7718e3b3c6
Parents: ef96cd3
Author: Andrew Or <an...@databricks.com>
Authored: Wed Jan 27 14:01:55 2016 -0800
Committer: Yin Huai <yh...@databricks.com>
Committed: Wed Jan 27 14:01:55 2016 -0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/Accumulable.scala | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/d702f0c1/core/src/main/scala/org/apache/spark/Accumulable.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/Accumulable.scala b/core/src/main/scala/org/apache/spark/Accumulable.scala
index bde1361..52f572b 100644
--- a/core/src/main/scala/org/apache/spark/Accumulable.scala
+++ b/core/src/main/scala/org/apache/spark/Accumulable.scala
@@ -57,7 +57,8 @@ import org.apache.spark.util.Utils
*/
class Accumulable[R, T] private (
val id: Long,
- @transient initialValue: R,
+ // SI-8813: This must explicitly be a private val, or else scala 2.11 doesn't compile
+ @transient private val initialValue: R,
param: AccumulableParam[R, T],
val name: Option[String],
internal: Boolean,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org