hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vvasu...@apache.org
Subject [1/2] hadoop git commit: YARN-4562. YARN WebApp ignores the configuration passed to it for keystore settings. Contributed by Sergey Shelukhin.
Date Mon, 11 Apr 2016 04:12:50 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 88556294e -> 4baee3eb6
  refs/heads/trunk 1b78b2ba1 -> 07920acc1


YARN-4562. YARN WebApp ignores the configuration passed to it for keystore settings. Contributed
by Sergey Shelukhin.


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

Branch: refs/heads/trunk
Commit: 07920acc165f17e8fe3ca9d21283a2123223f438
Parents: 1b78b2b
Author: Varun Vasudev <vvasudev@apache.org>
Authored: Mon Apr 11 09:39:57 2016 +0530
Committer: Varun Vasudev <vvasudev@apache.org>
Committed: Mon Apr 11 09:39:57 2016 +0530

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/07920acc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
index 6144a0d..d86e180 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
@@ -270,7 +270,7 @@ public class WebApps {
         }
 
         if (httpScheme.equals(WebAppUtils.HTTPS_PREFIX)) {
-          WebAppUtils.loadSslConfiguration(builder);
+          WebAppUtils.loadSslConfiguration(builder, conf);
         }
 
         HttpServer2 server = builder.build();


Mime
View raw message