Repository: mesos Updated Branches: refs/heads/master 0def34371 -> babb1c06e
Updated documentation/flags regarding new default hostname semantics. Review: https://reviews.apache.org/r/26185 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/babb1c06 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/babb1c06 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/babb1c06 Branch: refs/heads/master Commit: babb1c06ecf3077f292a19cfcbf1f1a4ed0e07b1 Parents: 0def343 Author: Evelina Dumitrescu <[email protected]> Authored: Tue Sep 30 13:51:18 2014 -0700 Committer: Vinod Kone <[email protected]> Committed: Tue Sep 30 13:51:18 2014 -0700 ---------------------------------------------------------------------- docs/configuration.md | 4 ++-- src/master/flags.hpp | 3 ++- src/slave/flags.hpp | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/babb1c06/docs/configuration.md ---------------------------------------------------------------------- diff --git a/docs/configuration.md b/docs/configuration.md index fb92cfa..c8b6ca0 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -78,7 +78,7 @@ If you have special compilation requirements, please refer to `./configure --hel between a given user's frameworks. Options are the same as for user_allocator. (default: drf) --hostname=VALUE The hostname the master should advertise in ZooKeeper. - If left unset, system hostname will be used (recommended). + If left unset, the hostname is resolved from the IP address that the master binds to. --[no-]log_auto_initialize Whether to automatically initialize the replicated log used for the registry. If this is set to false, the log has to be manually initialized when used for the very first time. (default: true) @@ -215,7 +215,7 @@ If you have special compilation requirements, please refer to `./configure --hel environment or find hadoop on PATH) (default: ) --hostname=VALUE The hostname the slave should report. - If left unset, system hostname will be used (recommended). + If left unset, the hostname is resolved from the IP address that the slave binds to. --isolation=VALUE Isolation mechanisms to use, e.g., 'posix/cpu,posix/mem' or 'cgroups/cpu,cgroups/mem' or 'external'. (default: posix/cpu,posix/mem) http://git-wip-us.apache.org/repos/asf/mesos/blob/babb1c06/src/master/flags.hpp ---------------------------------------------------------------------- diff --git a/src/master/flags.hpp b/src/master/flags.hpp index 507ca60..b8b59a2 100644 --- a/src/master/flags.hpp +++ b/src/master/flags.hpp @@ -52,7 +52,8 @@ public: add(&Flags::hostname, "hostname", "The hostname the master should advertise in ZooKeeper.\n" - "If left unset, system hostname will be used (recommended)."); + "If left unset, the hostname is resolved from the IP address\n" + "that the master binds to."); add(&Flags::root_submissions, "root_submissions", http://git-wip-us.apache.org/repos/asf/mesos/blob/babb1c06/src/slave/flags.hpp ---------------------------------------------------------------------- diff --git a/src/slave/flags.hpp b/src/slave/flags.hpp index 32e51d2..16f0cc2 100644 --- a/src/slave/flags.hpp +++ b/src/slave/flags.hpp @@ -42,7 +42,8 @@ public: add(&Flags::hostname, "hostname", "The hostname the slave should report.\n" - "If left unset, system hostname will be used (recommended)."); + "If left unset, the hostname is resolved from the IP address\n" + "that the slave binds to."); add(&Flags::version, "version",
