From 6c751940ea8449b7540ba956a00ed19ba0af599b Mon Sep 17 00:00:00 2001 From: Cheng Lian Date: Fri, 4 Sep 2015 22:57:52 -1000 Subject: [HOTFIX] [SQL] Fixes compilation error Jenkins master builders are currently broken by a merge conflict between PR #8584 and PR #8155. Author: Cheng Lian Closes #8614 from liancheng/hotfix/fix-pr-8155-8584-conflict. --- sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql') diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala index 589ba86a84..3d2bd236ce 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/SQLConfSuite.scala @@ -80,7 +80,7 @@ class SQLConfSuite extends QueryTest with SharedSQLContext { val original = sqlContext.conf.numShufflePartitions try{ sql(s"set ${SQLConf.Deprecated.MAPRED_REDUCE_TASKS}=10") - assert(ctx.conf.numShufflePartitions === 10) + assert(sqlContext.conf.numShufflePartitions === 10) } finally { sql(s"set ${SQLConf.SHUFFLE_PARTITIONS}=$original") } -- cgit v1.2.3