Repository: spark Updated Branches: refs/heads/branch-2.0 aac860802 -> 1dd152656
[HOTFIX] Fix Scala 2.10 compilation (cherry picked from commit c4524f5193e1b3ce1c56c5aed126f4121ce26d23) Signed-off-by: Reynold Xin <r...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1dd15265 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1dd15265 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1dd15265 Branch: refs/heads/branch-2.0 Commit: 1dd152656a56b83c6daabda22148c495357ea3e3 Parents: aac8608 Author: Reynold Xin <r...@databricks.com> Authored: Mon Jul 18 17:56:36 2016 -0700 Committer: Reynold Xin <r...@databricks.com> Committed: Mon Jul 18 17:57:10 2016 -0700 ---------------------------------------------------------------------- .../org/apache/spark/sql/catalyst/LogicalPlanToSQLSuite.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/1dd15265/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/LogicalPlanToSQLSuite.scala ---------------------------------------------------------------------- diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/LogicalPlanToSQLSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/LogicalPlanToSQLSuite.scala index 698c7c3..1f5078d 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/LogicalPlanToSQLSuite.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/catalyst/LogicalPlanToSQLSuite.scala @@ -40,8 +40,8 @@ class LogicalPlanToSQLSuite extends SQLBuilderTest with SQLTestUtils { import testImplicits._ // Used for generating new query answer files by saving - private val regenerateGoldenFiles = - Option(System.getenv("SPARK_GENERATE_GOLDEN_FILES")).contains("1") + private val regenerateGoldenFiles: Boolean = + Option(System.getenv("SPARK_GENERATE_GOLDEN_FILES")) == Some("1") private val goldenSQLPath = "src/test/resources/sqlgen/" protected override def beforeAll(): Unit = { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org