Resolve conflicts

Author: Robert Kruszewski

dev/test-dependencies.sh

@@ -29,11 +29,7 @@ export LC_ALL=C
 # TODO: This would be much nicer to do in SBT, once SBT supports Maven-style resolution.
 
 # NOTE: These should match those in the release publishing script
-<<<<<<< HEAD
 HADOOP2_MODULE_PROFILES="-Phadoop-cloud -Pkubernetes -Pyarn -Phive"
-=======
-HADOOP2_MODULE_PROFILES="-Phive-thriftserver -Pmesos -Pkafka-0-8 -Pyarn -Phive"
->>>>>>> master
 MVN="build/mvn"
 HADOOP_PROFILES=(
     hadoop-palantir

pom.xml

@@ -696,11 +696,7 @@
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-all</artifactId>
-<<<<<<< HEAD
         <version>4.0.50.Final</version>
-=======
-        <version>4.0.47.Final</version>
->>>>>>> master
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>

project/SparkBuild.scala

@@ -57,20 +57,13 @@ object BuildCommons {
     "tags", "sketch", "kvstore"
   ).map(ProjectRef(buildLocation, _)) ++ sqlProjects ++ streamingProjects
 
-<<<<<<< HEAD
   val optionallyEnabledProjects@Seq(mesos, yarn, sparkGangliaLgpl,
     streamingKinesisAsl, dockerIntegrationTests, hadoopCloud, kubernetes, _*) =
-    Seq("mesos", "yarn", "ganglia-lgpl", "streaming-kinesis-asl", "docker-integration-tests",
+    Seq("mesos", "yarn", "streaming-kafka-0-8", "ganglia-lgpl", "streaming-kinesis-asl", "docker-integration-tests",
       "hadoop-cloud", "kubernetes", "kubernetes-integration-tests",
       "kubernetes-integration-tests-spark-jobs", "kubernetes-integration-tests-spark-jobs-helpers",
       "kubernetes-docker-minimal-bundle"
     ).map(ProjectRef(buildLocation, _))
-=======
-  val optionallyEnabledProjects@Seq(mesos, yarn, streamingKafka, sparkGangliaLgpl,
-    streamingKinesisAsl, dockerIntegrationTests, hadoopCloud) =
-    Seq("mesos", "yarn", "streaming-kafka-0-8", "ganglia-lgpl", "streaming-kinesis-asl",
-      "docker-integration-tests", "hadoop-cloud").map(ProjectRef(buildLocation, _))
->>>>>>> master
 
   val assemblyProjects@Seq(networkYarn, streamingFlumeAssembly, streamingKafkaAssembly, streamingKafka010Assembly, streamingKinesisAslAssembly) =
     Seq("network-yarn", "streaming-flume-assembly", "streaming-kafka-0-8-assembly", "streaming-kafka-0-10-assembly", "streaming-kinesis-asl-assembly")

sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala

@@ -322,20 +322,18 @@ object SQLConf {
       .booleanConf
       .createWithDefault(true)
 
-<<<<<<< HEAD
   val PARQUET_PARTITION_PRUNING_ENABLED = buildConf("spark.sql.parquet.enablePartitionPruning")
       .doc("Enables driver-side partition pruning for Parquet.")
       .booleanConf
       .createWithDefault(true)
-=======
+
   val ORC_COMPRESSION = buildConf("spark.sql.orc.compression.codec")
     .doc("Sets the compression codec use when writing ORC files. Acceptable values include: " +
       "none, uncompressed, snappy, zlib, lzo.")
     .stringConf
     .transform(_.toLowerCase(Locale.ROOT))
     .checkValues(Set("none", "uncompressed", "snappy", "zlib", "lzo"))
     .createWithDefault("snappy")
->>>>>>> master
 
   val ORC_FILTER_PUSHDOWN_ENABLED = buildConf("spark.sql.orc.filterPushdown")
     .doc("When true, enable filter pushdown for ORC files.")

sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFilterSuite.scala

@@ -512,15 +512,9 @@ class ParquetFilterSuite extends QueryTest with ParquetTest with SharedSQLContex
               val accu = new NumRowGroupsAcc
               sparkContext.register(accu)
 
-<<<<<<< HEAD
               val df = spark.read.parquet(path).filter("a < 100")
               df.foreachPartition(_.foreach(v => accu.add(0)))
               df.collect
-=======
-            val df = spark.read.parquet(path).filter("a < 100")
-            df.foreachPartition((it: Iterator[Row]) => it.foreach(v => accu.add(0)))
-            df.collect
->>>>>>> master
 
               assert(func(accu.value))
               AccumulatorContext.remove(accu.id)