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 ae...@apache.org on 2016/06/20 16:53:50 UTC
[4/4] hadoop git commit: Merge branch 'trunk' into HDFS-1312
Merge branch 'trunk' into HDFS-1312
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3a0a329c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3a0a329c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3a0a329c
Branch: refs/heads/HDFS-1312
Commit: 3a0a329c4df7452d18371a34be867e86f3c6e310
Parents: cc5f81d fc6b50c
Author: Anu Engineer <ae...@apache.org>
Authored: Mon Jun 20 09:50:50 2016 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Mon Jun 20 09:50:50 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/util/LineReader.java | 5 +-
.../org/apache/hadoop/util/TestLineReader.java | 59 ++++++++++++--------
.../hadoop/yarn/webapp/util/WebAppUtils.java | 51 +++++++++++++++++
.../yarn/webapp/util/TestWebAppUtils.java | 42 ++++++++++++++
.../nodemanager/webapp/NMWebAppFilter.java | 10 ++--
.../resourcemanager/webapp/RMWebAppFilter.java | 24 ++------
6 files changed, 144 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org