Repository: spark Updated Branches: refs/heads/branch-1.5 dc5ae0334 -> f97db9499
docs/running-on-mesos.md: state default values in default column This PR simply uses the default value column for defaults. Author: Felix Bechstein <[email protected]> Closes #8810 from felixb/fix_mesos_doc. (cherry picked from commit 9a56dcdf7f19c9f7f913a2ce9bc981cb43a113c5) Signed-off-by: Reynold Xin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f97db949 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f97db949 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f97db949 Branch: refs/heads/branch-1.5 Commit: f97db949923f60f805663849693c8077e8398b8c Parents: dc5ae03 Author: Felix Bechstein <[email protected]> Authored: Thu Sep 17 22:42:46 2015 -0700 Committer: Reynold Xin <[email protected]> Committed: Thu Sep 17 22:43:09 2015 -0700 ---------------------------------------------------------------------- docs/running-on-mesos.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/f97db949/docs/running-on-mesos.md ---------------------------------------------------------------------- diff --git a/docs/running-on-mesos.md b/docs/running-on-mesos.md index f36921a..477d5a5 100644 --- a/docs/running-on-mesos.md +++ b/docs/running-on-mesos.md @@ -330,21 +330,21 @@ See the [configuration page](configuration.html) for information on Spark config </tr> <tr> <td><code>spark.mesos.principal</code></td> - <td>Framework principal to authenticate to Mesos</td> + <td>(none)</td> <td> Set the principal with which Spark framework will use to authenticate with Mesos. </td> </tr> <tr> <td><code>spark.mesos.secret</code></td> - <td>Framework secret to authenticate to Mesos</td> + <td>(none)/td> <td> Set the secret with which Spark framework will use to authenticate with Mesos. </td> </tr> <tr> <td><code>spark.mesos.role</code></td> - <td>Role for the Spark framework</td> + <td>*</td> <td> Set the role of this Spark framework for Mesos. Roles are used in Mesos for reservations and resource weight sharing. @@ -352,7 +352,7 @@ See the [configuration page](configuration.html) for information on Spark config </tr> <tr> <td><code>spark.mesos.constraints</code></td> - <td>Attribute based constraints to be matched against when accepting resource offers.</td> + <td>(none)</td> <td> Attribute based constraints on mesos resource offers. By default, all resource offers will be accepted. Refer to <a href="http://mesos.apache.org/documentation/attributes-resources/";>Mesos Attributes & Resources</a> for more information on attributes. <ul> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
