Repository: flink Updated Branches: refs/heads/release-1.4 f00126459 -> 28b3115d2
[FLINK-8102][docs] Fixed formatting issues in Mesos documentation. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/28b3115d Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/28b3115d Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/28b3115d Branch: refs/heads/release-1.4 Commit: 28b3115d23ab6844583578f7f2c7c37316c199be Parents: f001264 Author: Joerg Schad <[email protected]> Authored: Fri Nov 17 22:23:02 2017 -0800 Committer: zentol <[email protected]> Committed: Mon Nov 20 15:57:23 2017 +0100 ---------------------------------------------------------------------- docs/ops/config.md | 4 ++-- docs/ops/deployment/mesos.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/28b3115d/docs/ops/config.md ---------------------------------------------------------------------- diff --git a/docs/ops/config.md b/docs/ops/config.md index c85ce84..bcf7671 100644 --- a/docs/ops/config.md +++ b/docs/ops/config.md @@ -523,7 +523,7 @@ May be set to -1 to disable this feature. - `mesos.resourcemanager.tasks.container.image.name`: Image name to use for the container (**NO DEFAULT**) -- `mesos.resourcemanager.tasks.container.volumes`: A comma seperated list of [host_path:]container_path[:RO|RW]. This allows for mounting additional volumes into your container. (**NO DEFAULT**) +- `mesos.resourcemanager.tasks.container.volumes`: A comma separated list of `[host_path:]`container_path`[:RO|RW]`. This allows for mounting additional volumes into your container. (**NO DEFAULT**) - `high-availability.zookeeper.path.mesos-workers`: The ZooKeeper root path for persisting the Mesos worker information. @@ -559,7 +559,7 @@ Previously this key was named `recovery.mode` and the default value was `standal - `high-availability.job.delay`: (Default `akka.ask.timeout`) Defines the delay before persisted jobs are recovered in case of a master recovery situation. Previously this key was named `recovery.job.delay`. -- `high-availability.zookeeper.client.acl`: (Default `open`) Defines the ACL (open|creator) to be configured on ZK node. The configuration value can be set to "creator" if the ZooKeeper server configuration has the "authProvider" property mapped to use SASLAuthenticationProvider and the cluster is configured to run in secure mode (Kerberos). The ACL options are based on https://zookeeper.apache.org/doc/r3.1.2/zookeeperProgrammers.html#sc_BuiltinACLSchemes +- `high-availability.zookeeper.client.acl`: (Default `open`) Defines the ACL (open\|creator) to be configured on ZK node. The configuration value can be set to "creator" if the ZooKeeper server configuration has the "authProvider" property mapped to use SASLAuthenticationProvider and the cluster is configured to run in secure mode (Kerberos). The ACL options are based on https://zookeeper.apache.org/doc/r3.1.2/zookeeperProgrammers.html#sc_BuiltinACLSchemes #### ZooKeeper Security http://git-wip-us.apache.org/repos/asf/flink/blob/28b3115d/docs/ops/deployment/mesos.md ---------------------------------------------------------------------- diff --git a/docs/ops/deployment/mesos.md b/docs/ops/deployment/mesos.md index 36b6df7..56d0cde 100644 --- a/docs/ops/deployment/mesos.md +++ b/docs/ops/deployment/mesos.md @@ -262,7 +262,7 @@ May be set to -1 to disable this feature. `mesos.resourcemanager.tasks.container.image.name`: Image name to use for the container (**NO DEFAULT**) -`mesos.resourcemanager.tasks.container.volumes`: A comma seperated list of [host_path:]container_path[:RO|RW]. This allows for mounting additional volumes into your container. (**NO DEFAULT**) +`mesos.resourcemanager.tasks.container.volumes`: A comma separated list of `[host_path:]`container_path`[:RO|RW]`. This allows for mounting additional volumes into your container. (**NO DEFAULT**) `mesos.resourcemanager.tasks.hostname`: Optional value to define the TaskManager's hostname. The pattern `_TASK_` is replaced by the actual id of the Mesos task. This can be used to configure the TaskManager to use Mesos DNS (e.g. `_TASK_.flink-service.mesos`) for name lookups. (**NO DEFAULT**)
