Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-2541. Fixed ResourceManagerRest.apt.vm table syntax error. Contributed by Jian He 

(cherry picked from commit 5633da2a01)
This commit is contained in:
Jian He 2014-09-11 21:31:09 -07:00
parent 993ede4db3
commit f580586ab7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-yarn-project/CHANGES.txt
View File

@ -303,6 +303,8 @@ Release 2.6.0 - UNRELEASED
YARN-2534. FairScheduler: Potential integer overflow calculating totalMaxShare. YARN-2534. FairScheduler: Potential integer overflow calculating totalMaxShare.
(Zhihai Xu via kasha) (Zhihai Xu via kasha)
YARN-2541. Fixed ResourceManagerRest.apt.vm table syntax error. (jianhe)
Release 2.5.1 - 2014-09-05 Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

6
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
View File

@ -1494,11 +1494,11 @@ _01_000001</amContainerLogs>
| amHostHttpAddress | string | The nodes http address of the application master | | 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 | | 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 | | 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 | | runningContainers | int | The number of containers currently running for the application |
+---------------------------------------------------------------+ *---------------+--------------+--------------------------------+
| memorySeconds | long | The amount of memory the application has allocated (megabyte-seconds) | | 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) | | vcoreSeconds | long | The amount of CPU resources the application has allocated (virtual core-seconds) |