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/17 07:50:10 UTC

[4/4] git commit: Merge branch 'trunk' into HDFS-6584

Merge branch 'trunk' into HDFS-6584


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/aaa7e217
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/aaa7e217
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/aaa7e217

Branch: refs/heads/HDFS-6584
Commit: aaa7e217577e94c5bdbe1787e626deb4428fd53e
Parents: bd2e409 0e7d1db
Author: Tsz-Wo Nicholas Sze <sz...@hortonworks.com>
Authored: Wed Sep 17 13:49:03 2014 +0800
Committer: Tsz-Wo Nicholas Sze <sz...@hortonworks.com>
Committed: Wed Sep 17 13:49:03 2014 +0800

----------------------------------------------------------------------
 hadoop-yarn-project/CHANGES.txt                 |   3 +
 ...pplicationHistoryManagerOnTimelineStore.java | 151 +++++++----
 .../ApplicationHistoryServer.java               |  11 +-
 ...pplicationHistoryManagerOnTimelineStore.java | 268 ++++++++++++++++---
 .../metrics/ApplicationMetricsConstants.java    |   6 +
 .../server/resourcemanager/RMAppManager.java    |   5 +
 .../metrics/ApplicationACLsUpdatedEvent.java    |  45 ++++
 .../metrics/SystemMetricsEventType.java         |   1 +
 .../metrics/SystemMetricsPublisher.java         |  36 +++
 .../server/resourcemanager/TestAppManager.java  |  11 +-
 .../metrics/TestSystemMetricsPublisher.java     |  15 +-
 11 files changed, 460 insertions(+), 92 deletions(-)
----------------------------------------------------------------------