Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/hadoop into trunk
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2120de58 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2120de58 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2120de58 Branch: refs/heads/trunk Commit: 2120de588b92b9f22b1cc4188761d6a8c61aa778 Parents: 182fc19 22ff9e6 Author: Kai Zheng <kai.zh...@intel.com> Authored: Thu May 19 07:17:08 2016 -0700 Committer: Kai Zheng <kai.zh...@intel.com> Committed: Thu May 19 07:17:08 2016 -0700 ---------------------------------------------------------------------- .../web/DelegationTokenAuthenticationFilter.java | 7 +++++-- .../security/token/delegation/web/ServletUtils.java | 7 +++++-- hadoop-project/pom.xml | 5 +++-- .../hadoop/yarn/server/webproxy/WebAppProxyServlet.java | 11 +++++++---- 4 files changed, 20 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
