From ee7b2fd5de2abc17648f6ee1a55637d9b2a4f5e0 Mon Sep 17 00:00:00 2001 From: Naganarasimha Date: Tue, 15 May 2018 00:03:38 +0800 Subject: [PATCH] YARN-8288. Fix wrong number of table columns in Resource Model doc. Contributed by Weiwei Yang. (cherry picked from commit 8a2b5914f3a68148f40f99105acf5dafcc326e89) --- .../src/site/markdown/ResourceModel.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 ce968cef100..fefd973901f 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..units` | Default unit for the specified resource type | | `yarn.resource-types..minimum` | The minimum request for the specified resource type | | `yarn.resource-types..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.` | 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.