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 vv...@apache.org on 2016/04/11 06:12:50 UTC
[1/2] hadoop git commit: YARN-4562. YARN WebApp ignores the
configuration passed to it for keystore settings. Contributed by Sergey
Shelukhin.
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 <vv...@apache.org>
Authored: Mon Apr 11 09:39:57 2016 +0530
Committer: Varun Vasudev <vv...@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();
[2/2] hadoop git commit: YARN-4562. YARN WebApp ignores the
configuration passed to it for keystore settings. Contributed by Sergey
Shelukhin.
Posted by vv...@apache.org.
YARN-4562. YARN WebApp ignores the configuration passed to it for keystore settings. Contributed by Sergey Shelukhin.
(cherry picked from commit 07920acc165f17e8fe3ca9d21283a2123223f438)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4baee3eb
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4baee3eb
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4baee3eb
Branch: refs/heads/branch-2
Commit: 4baee3eb674cfdab6e1bfa678211354656829ae3
Parents: 8855629
Author: Varun Vasudev <vv...@apache.org>
Authored: Mon Apr 11 09:39:57 2016 +0530
Committer: Varun Vasudev <vv...@apache.org>
Committed: Mon Apr 11 09:40:28 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/4baee3eb/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();