diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/_config.yml | 2 | ||||
| -rw-r--r-- | docs/running-on-mesos.md | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/docs/_config.yml b/docs/_config.yml index bbb576e0e7..e4fc093fe7 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -18,6 +18,6 @@ SPARK_VERSION: 2.1.0-SNAPSHOT SPARK_VERSION_SHORT: 2.1.0 SCALA_BINARY_VERSION: "2.11" SCALA_VERSION: "2.11.7" -MESOS_VERSION: 0.22.0 +MESOS_VERSION: 1.0.0 SPARK_ISSUE_TRACKER_URL: https://issues.apache.org/jira/browse/SPARK SPARK_GITHUB_URL: https://github.com/apache/spark diff --git a/docs/running-on-mesos.md b/docs/running-on-mesos.md index ce888b5445..d037e7be0a 100644 --- a/docs/running-on-mesos.md +++ b/docs/running-on-mesos.md @@ -433,6 +433,16 @@ See the [configuration page](configuration.html) for information on Spark config </td> </tr> <tr> + <td><code>spark.mesos.containerizer</code></td> + <td><code>docker</code></td> + <td> + This only affects docker containers, and must be one of "docker" + or "mesos". Mesos supports two types of + containerizers for docker: the "docker" containerizer, and the preferred + "mesos" containerizer. Read more here: http://mesos.apache.org/documentation/latest/container-image/ + </td> +</tr> +<tr> <td><code>spark.mesos.driver.webui.url</code></td> <td><code>(none)</code></td> <td> |