Repository: spark
Updated Branches:
  refs/heads/branch-1.2 665653d24 -> b89696372


[SPARK-2075][Core] backport for branch-1.2

backport #3740 for branch-1.2

Author: zsxwing <zsxw...@gmail.com>

Closes #3758 from zsxwing/SPARK-2075-branch-1.2 and squashes the following 
commits:

b57d440 [zsxwing] SPARK-2075 backport for branch-1.2


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

Branch: refs/heads/branch-1.2
Commit: b896963728154ec51689fd3e975fc5033eb24d8c
Parents: 665653d
Author: zsxwing <zsxw...@gmail.com>
Authored: Mon Dec 22 11:13:40 2014 -0800
Committer: Reynold Xin <r...@databricks.com>
Committed: Mon Dec 22 11:13:40 2014 -0800

----------------------------------------------------------------------
 core/src/main/scala/org/apache/spark/rdd/RDD.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/b8969637/core/src/main/scala/org/apache/spark/rdd/RDD.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/rdd/RDD.scala 
b/core/src/main/scala/org/apache/spark/rdd/RDD.scala
index 8f4db14..ff6d946 100644
--- a/core/src/main/scala/org/apache/spark/rdd/RDD.scala
+++ b/core/src/main/scala/org/apache/spark/rdd/RDD.scala
@@ -1173,7 +1173,7 @@ abstract class RDD[T: ClassTag](
     val nullWritableClassTag = implicitly[ClassTag[NullWritable]]
     val textClassTag = implicitly[ClassTag[Text]]
     val r = this.map(x => (NullWritable.get(), new Text(x.toString)))
-    RDD.rddToPairRDDFunctions(r)(nullWritableClassTag, textClassTag, null)
+    rddToPairRDDFunctions(r)(nullWritableClassTag, textClassTag, null)
       .saveAsHadoopFile[TextOutputFormat[NullWritable, Text]](path)
   }
 
@@ -1185,7 +1185,7 @@ abstract class RDD[T: ClassTag](
     val nullWritableClassTag = implicitly[ClassTag[NullWritable]]
     val textClassTag = implicitly[ClassTag[Text]]
     val r = this.map(x => (NullWritable.get(), new Text(x.toString)))
-    RDD.rddToPairRDDFunctions(r)(nullWritableClassTag, textClassTag, null)
+    rddToPairRDDFunctions(r)(nullWritableClassTag, textClassTag, null)
       .saveAsHadoopFile[TextOutputFormat[NullWritable, Text]](path, codec)
   }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to