diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 5f68a43e700..3b04050d7db 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 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 0c6edad2a89..da464a951c5 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();