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 ar...@apache.org on 2014/09/08 19:37:44 UTC

[5/5] git commit: Merge branch 'trunk' into HDFS-6581

Merge branch 'trunk' into HDFS-6581


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

Branch: refs/heads/HDFS-6581
Commit: 6e5f780d1dea8e87bc956801477e409dce5997f3
Parents: ccdf005 302d9a0
Author: arp <ar...@apache.org>
Authored: Mon Sep 8 10:37:26 2014 -0700
Committer: arp <ar...@apache.org>
Committed: Mon Sep 8 10:37:26 2014 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt |  3 ++
 .../crypto/key/TestKeyProviderFactory.java      | 24 ++++++------
 .../hadoop/security/TestLdapGroupsMapping.java  |  4 +-
 .../alias/TestCredentialProviderFactory.java    | 17 +++++----
 .../hadoop/security/ssl/KeyStoreTestUtil.java   |  4 +-
 .../hadoop/security/ssl/TestSSLFactory.java     |  4 +-
 hadoop-yarn-project/CHANGES.txt                 |  9 +++++
 .../hadoop/yarn/api/records/ContainerId.java    | 39 +++++++++++++++++++-
 .../apache/hadoop/yarn/util/ConverterUtils.java | 15 +-------
 .../apache/hadoop/yarn/api/TestContainerId.java |  4 ++
 .../hadoop/yarn/util/TestConverterUtils.java    |  9 +++++
 .../timeline/webapp/CrossOriginFilter.java      | 20 +++++++++-
 .../timeline/webapp/TestCrossOriginFilter.java  | 21 ++++++++++-
 .../src/site/apt/TimelineServer.apt.vm          | 37 +++++++++++++++++++
 14 files changed, 171 insertions(+), 39 deletions(-)
----------------------------------------------------------------------