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 B4D5D200C78 for ; Thu, 13 Apr 2017 01:41:53 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B3861160B95; Wed, 12 Apr 2017 23:41:53 +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 06175160BAD for ; Thu, 13 Apr 2017 01:41:52 +0200 (CEST) Received: (qmail 49728 invoked by uid 500); 12 Apr 2017 23:41:49 -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 49088 invoked by uid 99); 12 Apr 2017 23:41:48 -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; Wed, 12 Apr 2017 23:41:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BA8CBED4A1; Wed, 12 Apr 2017 23:41:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: aengineer@apache.org To: common-commits@hadoop.apache.org Date: Wed, 12 Apr 2017 23:41:57 -0000 Message-Id: In-Reply-To: <80589df660084b789597b791bc169975@git.apache.org> References: <80589df660084b789597b791bc169975@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: =?utf-8?q?=5B10/50=5D_hadoop_git_commit=3A_YARN-6258=2E_localBaseA?= =?utf-8?q?ddress_for_CORS_proxy_configuration_is_not_working_when_suffixed_?= =?utf-8?q?with_forward_slash_in_new_YARN_UI=2E_Contributed_by_Gergely_Nov?= =?utf-8?b?w6FrLg==?= archived-at: Wed, 12 Apr 2017 23:41:53 -0000 YARN-6258. localBaseAddress for CORS proxy configuration is not working when suffixed with forward slash in new YARN UI. Contributed by Gergely Novák. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ad24464b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ad24464b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ad24464b Branch: refs/heads/HDFS-7240 Commit: ad24464be85bf37bf1677da1a2701a6acd7999d2 Parents: e7167e4 Author: Sunil G Authored: Fri Apr 7 11:42:50 2017 +0530 Committer: Sunil G Committed: Fri Apr 7 11:42:50 2017 +0530 ---------------------------------------------------------------------- .../hadoop-yarn-ui/src/main/webapp/app/services/hosts.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ad24464b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js index 19863e1..807844e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/services/hosts.js @@ -61,7 +61,11 @@ export default Ember.Service.extend({ }, localBaseAddress: Ember.computed(function () { - return this.localAddress(); + var url = this.localAddress(); + if (url.endsWith('/')) { + url = url.slice(0, -1); + } + return url; }), timelineWebAddress: Ember.computed(function () { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org