You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2014/09/13 08:57:48 UTC
[08/12] git commit: YARN-2541. Fixed ResourceManagerRest.apt.vm table
syntax error. Contributed by Jian He
YARN-2541. Fixed ResourceManagerRest.apt.vm table syntax error. Contributed by Jian He
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5633da2a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5633da2a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5633da2a
Branch: refs/heads/HDFS-6584
Commit: 5633da2a018efcfac03cc1dd65af79bce2f1a11b
Parents: d6ce269
Author: Jian He <ji...@apache.org>
Authored: Thu Sep 11 21:31:09 2014 -0700
Committer: Jian He <ji...@apache.org>
Committed: Thu Sep 11 21:31:09 2014 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 2 ++
.../hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5633da2a/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index b8c6cf4..570a855 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -329,6 +329,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
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5633da2a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
----------------------------------------------------------------------
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 0fd5b24..c819f16 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</amContainerLogs>
| 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) |