YARN-8288. Fix wrong number of table columns in Resource Model doc. Contributed by Weiwei Yang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8a2b5914 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8a2b5914 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8a2b5914 Branch: refs/heads/HDDS-4 Commit: 8a2b5914f3a68148f40f99105acf5dafcc326e89 Parents: 89d0b87 Author: Naganarasimha <naganarasimha...@apache.org> Authored: Tue May 15 00:03:38 2018 +0800 Committer: Naganarasimha <naganarasimha...@apache.org> Committed: Tue May 15 00:05:23 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/8a2b5914/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 75e5c92..f968b5f 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 @@ -45,20 +45,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: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
