Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AF4AA10B7F for ; Thu, 29 Aug 2013 15:37:47 +0000 (UTC) Received: (qmail 6463 invoked by uid 500); 29 Aug 2013 15:37:47 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 6442 invoked by uid 500); 29 Aug 2013 15:37:47 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 6435 invoked by uid 99); 29 Aug 2013 15:37:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Aug 2013 15:37:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8BBD38C6BFD; Thu, 29 Aug 2013 15:37:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yusaku@apache.org To: ambari-commits@incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-3048. "Use local repo" always installs the default stack version regardless of stack selected by the user. (alexantonenko via yusaku) Date: Thu, 29 Aug 2013 15:37:46 +0000 (UTC) Updated Branches: refs/heads/trunk 43283406c -> 462c6432d AMBARI-3048. "Use local repo" always installs the default stack version regardless of stack selected by the user. (alexantonenko via yusaku) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/462c6432 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/462c6432 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/462c6432 Branch: refs/heads/trunk Commit: 462c6432d42f9bb13bd847c5a01663e6c5205683 Parents: 4328340 Author: Yusaku Sako Authored: Thu Aug 29 18:36:47 2013 +0300 Committer: Yusaku Sako Committed: Thu Aug 29 18:36:47 2013 +0300 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard/step8_controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/462c6432/ambari-web/app/controllers/wizard/step8_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js index 38128ac..009d2d6 100644 --- a/ambari-web/app/controllers/wizard/step8_controller.js +++ b/ambari-web/app/controllers/wizard/step8_controller.js @@ -1024,7 +1024,7 @@ App.WizardStep8Controller = Em.Controller.extend({ var clusterName = this.get('clusterName'); var url = App.apiPrefix + '/clusters/' + clusterName; - var stackVersion = (this.get('content.installOptions.localRepo')) ? App.defaultLocalStackVersion : App.currentStackVersion; + var stackVersion = (this.get('content.installOptions.localRepo')) ? App.currentStackVersion.replace(/(-\d+(\.\d)*)/ig, "Local$&") : App.currentStackVersion; this.ajax({ type: 'POST',