merge in master

apache · Mar 13, 2016 · c1e4e41 · c1e4e41
1 parent be3830f
commit c1e4e41
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/test/scala/org/apache/spark/ContextCleanerSuite.scala b/core/src/test/scala/org/apache/spark/ContextCleanerSuite.scala
@@ -577,7 +577,7 @@ class CleanerTester(
     }
   }
 
-  private def uncleanedResourcesToString: String = {
+  private def uncleanedResourcesToString = {
     val s1 = {toBeCleanedRDDIds.synchronized {
       toBeCleanedRDDIds.toSeq.sorted.mkString("[", ", ", "]")}
     }