Repository: spark Updated Branches: refs/heads/master e52b8719c -> 30b8d369d
SPARK-2553. Fix compile error Author: Sandy Ryza <sa...@cloudera.com> Closes #1479 from sryza/sandy-spark-2553 and squashes the following commits: 2cb5ed8 [Sandy Ryza] SPARK-2553. Fix compile error Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/30b8d369 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/30b8d369 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/30b8d369 Branch: refs/heads/master Commit: 30b8d369d459be5da133f12ebb33a9c74579f468 Parents: e52b871 Author: Sandy Ryza <sa...@cloudera.com> Authored: Fri Jul 18 00:47:43 2014 -0700 Committer: Reynold Xin <r...@apache.org> Committed: Fri Jul 18 00:47:43 2014 -0700 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/30b8d369/core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala b/core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala index b284b63..5366c1a 100644 --- a/core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala +++ b/core/src/main/scala/org/apache/spark/rdd/CoGroupedRDD.scala @@ -185,6 +185,7 @@ class CoGroupedRDD[K](@transient var rdds: Seq[RDD[_ <: Product2[K, _]]], part: combiner1(depNum) ++= combiner2(depNum) depNum += 1 } + combiner1 } new ExternalAppendOnlyMap[K, CoGroupValue, CoGroupCombiner]( createCombiner, mergeValue, mergeCombiners)
