Repository: spark Updated Branches: refs/heads/branch-1.4 0131142d9 -> 2510365fa
[HOT-FIX] Fix compilation (caused by 0131142d98b191f6cc112d383aa10582a3ac35bf) Author: Yin Huai <yh...@databricks.com> Closes #6913 from yhuai/branch-1.4-hotfix and squashes the following commits: 7f91fa0 [Yin Huai] [HOT-FIX] Fix compilation (caused by 0131142d98b191f6cc112d383aa10582a3ac35bf). Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2510365f Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2510365f Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2510365f Branch: refs/heads/branch-1.4 Commit: 2510365faaa025e6f2767506ff1726dfd0ed4a77 Parents: 0131142 Author: Yin Huai <yh...@databricks.com> Authored: Fri Jun 19 17:29:51 2015 -0700 Committer: Yin Huai <yh...@databricks.com> Committed: Fri Jun 19 17:29:51 2015 -0700 ---------------------------------------------------------------------- .../src/test/scala/org/apache/spark/sql/json/TestJsonData.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/2510365f/sql/core/src/test/scala/org/apache/spark/sql/json/TestJsonData.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/test/scala/org/apache/spark/sql/json/TestJsonData.scala b/sql/core/src/test/scala/org/apache/spark/sql/json/TestJsonData.scala index 9322f17..a8dfd7e 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/json/TestJsonData.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/json/TestJsonData.scala @@ -186,7 +186,7 @@ object TestJsonData { """{"b":"str_b_4", "a":"str_a_4", "c":"str_c_4"}""" :: """]""" :: Nil) - val emptyRecords: RDD[String] = + val emptyRecords = TestSQLContext.sparkContext.parallelize( """{""" :: """""" :: --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org