Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8CDC1200C7E for ; Tue, 9 May 2017 07:47:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8B910160BBF; Tue, 9 May 2017 05:47:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CF0EB160BC7 for ; Tue, 9 May 2017 07:47:24 +0200 (CEST) Received: (qmail 95343 invoked by uid 500); 9 May 2017 05:47:24 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 95324 invoked by uid 99); 9 May 2017 05:47:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 May 2017 05:47:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CE46ADFEF3; Tue, 9 May 2017 05:47:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vvasudev@apache.org To: common-commits@hadoop.apache.org Date: Tue, 09 May 2017 05:47:24 -0000 Message-Id: <04f3217964d746198e3505b355e19e88@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] hadoop git commit: YARN-4562. YARN WebApp ignores the configuration passed to it for keystore settings. Contributed by Sergey Shelukhin. archived-at: Tue, 09 May 2017 05:47:25 -0000 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 Authored: Mon Apr 11 09:39:57 2016 +0530 Committer: Varun Vasudev 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