svn merge -c 1612411 FIXES: YARN-2321. NodeManager web UI can incorrectly report Pmem enforcement. Contributed by Leitao Guo

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612414 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason Darrell Lowe 2014-07-21 22:08:12 +00:00
parent 04b1192ed6
commit 3fc91db99f
2 changed files with 4 additions and 1 deletions

View File

@ -61,6 +61,9 @@ Release 2.6.0 - UNRELEASED
YARN-2244. FairScheduler missing handling of containers for unknown
application attempts. (Anubhav Dhoot via kasha)
YARN-2321. NodeManager web UI can incorrectly report Pmem enforcement
(Leitao Guo via jlowe)
Release 2.5.0 - UNRELEASED
INCOMPATIBLE CHANGES

View File

@ -72,7 +72,7 @@ public class NodePage extends NMView {
._("Total Pmem allocated for Container",
StringUtils.byteDesc(info.getTotalPmemAllocated() * BYTES_IN_MB))
._("Pmem enforcement enabled",
info.isVmemCheckEnabled())
info.isPmemCheckEnabled())
._("Total VCores allocated for Containers",
String.valueOf(info.getTotalVCoresAllocated()))
._("NodeHealthyStatus",