Revert "[SPARK-6350][Mesos] Make mesosExecutorCores configurable in m…

…esos "fine-grained" mode"

This reverts commit da3caa6a062d7dd59875b3f8b83febe0c95f5c1e.

core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerBackend.scala

@@ -68,7 +68,7 @@ private[spark] class MesosSchedulerBackend(
   // The listener bus to publish executor added/removed events.
   val listenerBus = sc.listenerBus
 
-  val executorCores = sc.conf.getInt("spark.executor.frameworkCores", 1)
+  val executorCores = sc.conf.getInt("spark.mesos.executor.cores", 1)
 
   @volatile var appId: String = _
 

docs/configuration.md

@@ -137,14 +137,6 @@ of the most common options to set are:
     or in your default properties file.
   </td>
 </tr>
-  <td><code>spark.executor.frameworkCores</code></td>
-  <td>1</td>
-  <td>
-    Set the amount of cores allocated to the executor itself. This setting is currently used for Mesos fine-grained mode.
-    By default, executor will use the amount of cores even though no task is running on an executor.
-  </td>
-</tr>
-<tr>
 <tr>
   <td><code>spark.executor.memory</code></td>
   <td>512m</td>

docs/running-on-mesos.md

@@ -210,6 +210,14 @@ See the [configuration page](configuration.html) for information on Spark config
     Note that total amount of cores the executor will request in total will not exceed the spark.cores.max setting.
   </td>
 </tr>
+<tr>
+  <td><code>spark.mesos.executor.cores</code></td>
+  <td>1</td>
+  <td>
+    Set the amount of cores to request for running a mesos executor. This setting is only used for Mesos fine-grained mode.
+    By default, executor will use the amount of cores even though no task is running on an executor.
+  </td>
+</tr>
 <tr>
   <td><code>spark.mesos.executor.home</code></td>
   <td>driver side <code>SPARK_HOME</code></td>