resolve conflicts

Author: Robert Kruszewski

build/sbt-launch-lib.bash

@@ -111,7 +111,7 @@ addDebugger () {
 # a ham-fisted attempt to move some memory settings in concert
 # so they need not be dicked around with individually.
 get_mem_opts () {
-  local mem=${1:-2048}
+  local mem=${1:-4096}
   local perm=$(( $mem / 4 ))
   (( $perm > 256 )) || perm=256
   (( $perm < 4096 )) || perm=4096

core/src/main/scala/org/apache/spark/api/python/PythonRunner.scala

@@ -103,15 +103,11 @@ private[spark] abstract class BasePythonRunner[IN, OUT](
     if (reuseWorker) {
       envVars.put("SPARK_REUSE_WORKER", "1")
     }
-<<<<<<< HEAD
-    val worker: Socket = env.createPythonWorker(
-      pythonExec, envVars.asScala.toMap, condaInstructions)
-=======
     if (memoryMb.isDefined) {
       envVars.put("PYSPARK_EXECUTOR_MEMORY_MB", memoryMb.get.toString)
     }
-    val worker: Socket = env.createPythonWorker(pythonExec, envVars.asScala.toMap)
->>>>>>> master
+    val worker: Socket = env.createPythonWorker(
+      pythonExec, envVars.asScala.toMap, condaInstructions)
     // Whether is the worker released into idle pool
     val released = new AtomicBoolean(false)
 

core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionServer.scala

@@ -50,13 +50,7 @@ import org.apache.spark.util.Utils
 private[spark] abstract class RestSubmissionServer(
     val host: String,
     val requestedPort: Int,
-<<<<<<< HEAD
-    val masterConf: SparkConf,
-    val sslOptions: SSLOptions = SSLOptions()) extends Logging {
-=======
     val masterConf: SparkConf) extends Logging {
-
->>>>>>> master
   protected val submitRequestServlet: SubmitRequestServlet
   protected val killRequestServlet: KillRequestServlet
   protected val statusRequestServlet: StatusRequestServlet
@@ -90,18 +84,6 @@ private[spark] abstract class RestSubmissionServer(
     threadPool.setDaemon(true)
     val server = new Server(threadPool)
 
-    val resolvedConnectionFactories = sslOptions
-      .createJettySslContextFactory()
-      .map(sslFactory => {
-        val sslConnectionFactory = new SslConnectionFactory(
-          sslFactory, HttpVersion.HTTP_1_1.asString())
-        val rawHttpConfiguration = new HttpConfiguration()
-        rawHttpConfiguration.setSecureScheme("https")
-        rawHttpConfiguration.setSecurePort(startPort)
-        val rawHttpConnectionFactory = new HttpConnectionFactory(rawHttpConfiguration)
-        Array(sslConnectionFactory, rawHttpConnectionFactory)
-      }).getOrElse(Array(new HttpConnectionFactory()))
-
     val connector = new ServerConnector(
         server,
         null,
@@ -110,7 +92,7 @@ private[spark] abstract class RestSubmissionServer(
         null,
         -1,
         -1,
-        resolvedConnectionFactories: _*)
+        new HttpConnectionFactory())
     connector.setHost(host)
     connector.setPort(startPort)
     connector.setReuseAddress(!Utils.isWindows)