[mesos] branch master updated: Fixed documentation inaccuracies regarding `min_allocatable_resources`.

[mz...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mzhu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new e657836  Fixed documentation inaccuracies regarding `min_allocatable_resources`.
e657836 is described below

commit e6578361e7822a44d010118153de0fdeb4fe2caf
Author: Meng Zhu <mz...@mesosphere.io>
AuthorDate: Mon Jan 14 16:09:45 2019 -0800

    Fixed documentation inaccuracies regarding `min_allocatable_resources`.
    
    See diff.
---
 docs/configuration/master.md | 2 +-
 src/master/flags.cpp         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/configuration/master.md b/docs/configuration/master.md
index 0745c90..c56ac85 100644
--- a/docs/configuration/master.md
+++ b/docs/configuration/master.md
@@ -216,7 +216,7 @@ range or set. For example, `range:[1-5]` has a quantity of 5 and `set:{a,b}`
 has a quantity of 2. The resources in each set should be delimited by
 semicolons (acting as logical AND), and each set should be delimited by the
 pipe character (acting as logical OR).
-(Example: `disk:1|cpu:1;mem:32;port:1` configures the allocator to only offer
+(Example: `disk:1|cpus:1;mem:32;ports:1` configures the allocator to only offer
 resources if they contain a disk resource of at least 1 megabyte, or if they
 at least contain 1 cpu, 32 megabytes of memory and 1 port.)
 (default: cpus:0.01|mem:32).
diff --git a/src/master/flags.cpp b/src/master/flags.cpp
index 9288714..74f4daa 100644
--- a/src/master/flags.cpp
+++ b/src/master/flags.cpp
@@ -498,7 +498,7 @@ mesos::internal::master::Flags::Flags()
       "The resources in each set should be delimited by semicolons (acting as\n"
       "logical AND), and each set should be delimited by the pipe character\n"
       "(acting as logical OR).\n"
-      "(Example: `disk:1|cpu:1;mem:32;port:1` configures the allocator to\n"
+      "(Example: `disk:1|cpus:1;mem:32;ports:1` configures the allocator to\n"
       "only offer resources if they contain a disk resource of at least\n"
       "1 megabyte, or if they at least contain 1 cpu, 32 megabytes of memory\n"
       "and 1 port.)\n",