Repository: hadoop Updated Branches: refs/heads/branch-3.0 a700d05f7 -> ee7b2fd5d
YARN-8288. Fix wrong number of table columns in Resource Model doc. Contributed by Weiwei Yang. (cherry picked from commit 8a2b5914f3a68148f40f99105acf5dafcc326e89) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ee7b2fd5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ee7b2fd5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ee7b2fd5 Branch: refs/heads/branch-3.0 Commit: ee7b2fd5de2abc17648f6ee1a55637d9b2a4f5e0 Parents: a700d05 Author: Naganarasimha <[email protected]> Authored: Tue May 15 00:03:38 2018 +0800 Committer: Naganarasimha <[email protected]> Committed: Tue May 15 00:12:45 2018 +0800 ---------------------------------------------------------------------- .../hadoop-yarn-site/src/site/markdown/ResourceModel.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ee7b2fd5/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceModel.md ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceModel.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceModel.md index ce968ce..fefd973 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceModel.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceModel.md @@ -34,20 +34,20 @@ The following configuration properties are supported. See below for details. `resource-types.xml` -| Configuration Property | Value | Description | -|:---- |:---- |:---- | +| Configuration Property | Description | +|:---- |:---- | | `yarn.resource-types` | Comma-separated list of additional resources. May not include `memory`, `memory-mb`, or `vcores` | | `yarn.resource-types.<resource>.units` | Default unit for the specified resource type | | `yarn.resource-types.<resource>.minimum` | The minimum request for the specified resource type | | `yarn.resource-types.<resource>.maximum` | The maximum request for the specified resource type | -`nodeÂ-resources.xml` +`node-resources.xml` -| Configuration Property | Value | Description | -|:---- |:---- |:---- | +| Configuration Property | Description | +|:---- |:---- | | `yarn.nodemanager.resource-type.<resource>` | The count of the specified resource available from the node manager | -Please note that the `resource-types.xml` and `nodeÂ-resources.xml` files +Please note that the `resource-types.xml` and `node-resources.xml` files also need to be placed in the same configuration directory as `yarn-site.xml` if they are used. Alternatively, the properties may be placed into the `yarn-site.xml` file instead. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
