From f580586ab7572b16ba8ac5b47e90b96c8766f2cd Mon Sep 17 00:00:00 2001 From: Jian He Date: Thu, 11 Sep 2014 21:31:09 -0700 Subject: [PATCH] YARN-2541. Fixed ResourceManagerRest.apt.vm table syntax error. Contributed by Jian He (cherry picked from commit 5633da2a018efcfac03cc1dd65af79bce2f1a11b) --- hadoop-yarn-project/CHANGES.txt | 2 ++ .../src/site/apt/ResourceManagerRest.apt.vm | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index cdd115b5e7f..4eaf36a4cf7 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -303,6 +303,8 @@ Release 2.6.0 - UNRELEASED YARN-2534. FairScheduler: Potential integer overflow calculating totalMaxShare. (Zhihai Xu via kasha) + YARN-2541. Fixed ResourceManagerRest.apt.vm table syntax error. (jianhe) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm index 0fd5b242a13..c819f162afc 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm @@ -1494,11 +1494,11 @@ _01_000001 | amHostHttpAddress | string | The nodes http address of the application master | *---------------+--------------+--------------------------------+ | allocatedMB | int | The sum of memory in MB allocated to the application's running containers | -*---------------------------------------------------------------+ +*---------------+--------------+--------------------------------+ | allocatedVCores | int | The sum of virtual cores allocated to the application's running containers | -+---------------------------------------------------------------+ +*---------------+--------------+--------------------------------+ | runningContainers | int | The number of containers currently running for the application | -+---------------------------------------------------------------+ +*---------------+--------------+--------------------------------+ | memorySeconds | long | The amount of memory the application has allocated (megabyte-seconds) | *---------------+--------------+--------------------------------+ | vcoreSeconds | long | The amount of CPU resources the application has allocated (virtual core-seconds) |