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 07920acc16)
(cherry picked from commit 4baee3eb67)
This commit is contained in:
Varun Vasudev 2016-04-11 09:39:57 +05:30
parent c7c410898e
commit 0a149f3413
2 changed files with 4 additions and 1 deletions

View File

@ -73,6 +73,9 @@ Release 2.7.4 - UNRELEASED
YARN-6310. OutputStreams in AggregatedLogFormat.LogWriter can be left YARN-6310. OutputStreams in AggregatedLogFormat.LogWriter can be left
open upon exceptions (Haibo Chen via jlowe) 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 Release 2.7.3 - 2016-08-25
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -255,7 +255,7 @@ public class WebApps {
} }
if (httpScheme.equals(WebAppUtils.HTTPS_PREFIX)) { if (httpScheme.equals(WebAppUtils.HTTPS_PREFIX)) {
WebAppUtils.loadSslConfiguration(builder); WebAppUtils.loadSslConfiguration(builder, conf);
} }
HttpServer2 server = builder.build(); HttpServer2 server = builder.build();