You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by nn...@apache.org on 2015/03/27 21:06:27 UTC
mesos git commit: Fixed Attributes and Resources documentation.
Repository: mesos
Updated Branches:
refs/heads/master dfb2794d8 -> 8620bf4a4
Fixed Attributes and Resources documentation.
Review: https://reviews.apache.org/r/32579
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8620bf4a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8620bf4a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8620bf4a
Branch: refs/heads/master
Commit: 8620bf4a49d8b8379aa18989927311e1c334bdf9
Parents: dfb2794
Author: Michael Park <mc...@gmail.com>
Authored: Fri Mar 27 10:45:07 2015 -0700
Committer: Niklas Q. Nielsen <ni...@mesosphere.io>
Committed: Fri Mar 27 13:05:24 2015 -0700
----------------------------------------------------------------------
docs/attributes-resources.md | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/8620bf4a/docs/attributes-resources.md
----------------------------------------------------------------------
diff --git a/docs/attributes-resources.md b/docs/attributes-resources.md
index a65aee3..0ae8b59 100644
--- a/docs/attributes-resources.md
+++ b/docs/attributes-resources.md
@@ -1,6 +1,6 @@
---
+---
layout: documentation
---
+---
# Mesos Attributes & Resources
@@ -44,23 +44,23 @@ The Mesos system can manage 3 different *types* of resources: scalars, ranges, a
The Mesos master has a few resources that it pre-defines in how it handles them. At the current time, this list consist of:
- - `cpu`
+ - `cpus`
- `mem`
- `disk`
- `ports`
-In particular, a slave without `cpu` and `mem` resources will never have its resources advertised to any frameworks. Also, the Master's user interface interprets the scalars in `mem` and `disk` in terms of *`MB`*. IE: the value `15000` is displayed as `14.65GB`.
+In particular, a slave without `cpus` and `mem` resources will never have its resources advertised to any frameworks. Also, the Master's user interface interprets the scalars in `mem` and `disk` in terms of *`MB`*. IE: the value `15000` is displayed as `14.65GB`.
## Examples
Here are some examples for configuring the Mesos slaves.
- --resources='cpu:24;mem:24576;disk:409600;ports:[21000-24000];bugs:{a,b,c}'
+ --resources='cpus:24;mem:24576;disk:409600;ports:[21000-24000];bugs:{a,b,c}'
--attributes='rack:abc;zone:west;os:centos5,full'
-In this case, we have three different types of resources, scalars, a range, and a set. They are called `cpu`, `mem`, `disk`, and the range type is `ports`.
+In this case, we have three different types of resources, scalars, a range, and a set. They are called `cpus`, `mem`, `disk`, and the range type is `ports`.
- - scalar called `cpu`, with the value `24`
+ - scalar called `cpus`, with the value `24`
- scalar called `mem`, with the value `24576`
- scalar called `disk`, with the value `409600`
- range called `ports`, with values `21000` through `24000` (inclusive)