mesos git commit: Clarified docs for `--offer_timeout` master flag.

[vi...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master b8e130216 -> 55f9c9d57


Clarified docs for `--offer_timeout` master flag.

Review: https://reviews.apache.org/r/44185/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/55f9c9d5
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/55f9c9d5
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/55f9c9d5

Branch: refs/heads/master
Commit: 55f9c9d5725a4ea4478c31d1e25d5cbeafebecc3
Parents: b8e1302
Author: Neil Conway <ne...@gmail.com>
Authored: Tue Mar 1 13:30:56 2016 -0800
Committer: Vinod Kone <vi...@gmail.com>
Committed: Tue Mar 1 13:30:56 2016 -0800

----------------------------------------------------------------------
 docs/configuration.md | 1 +
 src/master/flags.cpp  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/55f9c9d5/docs/configuration.md
----------------------------------------------------------------------
diff --git a/docs/configuration.md b/docs/configuration.md
index c4d094a..43185fa 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -589,6 +589,7 @@ ping from the master. Slaves that do not respond within
 Duration of time before an offer is rescinded from a framework.
 This helps fairness when running frameworks that hold on to offers,
 or frameworks that accidentally drop offers.
+If not set, offers do not timeout.
   </td>
 </tr>
 <tr>

http://git-wip-us.apache.org/repos/asf/mesos/blob/55f9c9d5/src/master/flags.cpp
----------------------------------------------------------------------
diff --git a/src/master/flags.cpp b/src/master/flags.cpp
index 60e085b..ccf7422 100644
--- a/src/master/flags.cpp
+++ b/src/master/flags.cpp
@@ -341,7 +341,8 @@ mesos::internal::master::Flags::Flags()
       "offer_timeout",
       "Duration of time before an offer is rescinded from a framework.\n"
       "This helps fairness when running frameworks that hold on to offers,\n"
-      "or frameworks that accidentally drop offers.");
+      "or frameworks that accidentally drop offers.\n"
+      "If not set, offers do not timeout.");
 
   // This help message for --modules flag is the same for
   // {master,slave,tests}/flags.hpp and should always be kept in