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 2017/05/09 05:47:23 UTC
[1/2] hadoop git commit: YARN-4562. YARN WebApp ignores the
configuration passed to it for keystore settings. Contributed by Sergey
Shelukhin. Added CHANGES.txt entry
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 c7c410898 -> 0a149f341
refs/heads/branch-2.8 f8b6aa1ed -> 341457a0f
YARN-4562. YARN WebApp ignores the configuration passed to it for keystore settings. Contributed by Sergey Shelukhin.
Added CHANGES.txt entry
(cherry picked from commit 07920acc165f17e8fe3ca9d21283a2123223f438)
(cherry picked from commit 4baee3eb674cfdab6e1bfa678211354656829ae3)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0a149f34
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0a149f34
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0a149f34
Branch: refs/heads/branch-2.7
Commit: 0a149f3413afec4318206031570e957a970bd5f3
Parents: c7c4108
Author: Varun Vasudev <vv...@apache.org>
Authored: Mon Apr 11 09:39:57 2016 +0530
Committer: Varun Vasudev <vv...@apache.org>
Committed: Tue May 9 10:51:31 2017 +0530
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0a149f34/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 5f68a43..3b04050 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -73,6 +73,9 @@ Release 2.7.4 - UNRELEASED
YARN-6310. OutputStreams in AggregatedLogFormat.LogWriter can be left
open upon exceptions (Haibo Chen via jlowe)
+ YARN-4562. YARN WebApp ignores the configuration passed to it for keystore
+ settings (Sergey Shelukhin via vvasudev)
+
Release 2.7.3 - 2016-08-25
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0a149f34/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 0c6edad..da464a9 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
@@ -255,7 +255,7 @@ public class WebApps {
}
if (httpScheme.equals(WebAppUtils.HTTPS_PREFIX)) {
- WebAppUtils.loadSslConfiguration(builder);
+ WebAppUtils.loadSslConfiguration(builder, conf);
}
HttpServer2 server = builder.build();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[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)
(cherry picked from commit 4baee3eb674cfdab6e1bfa678211354656829ae3)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/341457a0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/341457a0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/341457a0
Branch: refs/heads/branch-2.8
Commit: 341457a0f246d9ad83a8ce907c7347dcb39ede34
Parents: f8b6aa1
Author: Varun Vasudev <vv...@apache.org>
Authored: Mon Apr 11 09:39:57 2016 +0530
Committer: Varun Vasudev <vv...@apache.org>
Committed: Tue May 9 10:59:15 2017 +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/341457a0/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 0c6edad..da464a9 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
@@ -255,7 +255,7 @@ public class WebApps {
}
if (httpScheme.equals(WebAppUtils.HTTPS_PREFIX)) {
- WebAppUtils.loadSslConfiguration(builder);
+ WebAppUtils.loadSslConfiguration(builder, conf);
}
HttpServer2 server = builder.build();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org