Return-Path: 
 <commits-return-26513-apmail-ambari-commits-archive=ambari.apache.org@ambari.apache.org>
X-Original-To: apmail-ambari-commits-archive@www.apache.org
Delivered-To: apmail-ambari-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3D4B619800
	for <apmail-ambari-commits-archive@www.apache.org>;
 Wed,  6 Apr 2016 19:56:24 +0000 (UTC)
Received: (qmail 50402 invoked by uid 500); 6 Apr 2016 19:56:24 -0000
Delivered-To: apmail-ambari-commits-archive@ambari.apache.org
Received: (qmail 50373 invoked by uid 500); 6 Apr 2016 19:56:24 -0000
Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ambari.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ambari.apache.org>
List-Post: <mailto:commits@ambari.apache.org>
List-Id: <commits.ambari.apache.org>
Reply-To: ambari-dev@ambari.apache.org
Delivered-To: mailing list commits@ambari.apache.org
Received: (qmail 50363 invoked by uid 99); 6 Apr 2016 19:56:24 -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, 06 Apr 2016 19:56:24 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id B0663DFE61; Wed,  6 Apr 2016 19:56:23 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: zhewang@apache.org
To: commits@ambari.apache.org
Message-Id: <fbfc2f6703914af089e51686bcc38de6@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: ambari git commit: AMBARI-15722 [Ambari Web] move RedHat Satellite
 option out of experimental (zhewang)
Date: Wed,  6 Apr 2016 19:56:23 +0000 (UTC)

Repository: ambari
Updated Branches:
  refs/heads/trunk d1655dc57 -> ef30d78a3


AMBARI-15722 [Ambari Web] move RedHat Satellite option out of experimental (zhewang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ef30d78a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ef30d78a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ef30d78a

Branch: refs/heads/trunk
Commit: ef30d78a3913abdb3ab91fd4b683e140bef21bfc
Parents: d1655dc
Author: Zhe (Joe) Wang <zhewang@apache.org>
Authored: Wed Apr 6 12:55:39 2016 -0700
Committer: Zhe (Joe) Wang <zhewang@apache.org>
Committed: Wed Apr 6 12:55:39 2016 -0700

----------------------------------------------------------------------
 .../main/admin/stack_upgrade/edit_repositories.hbs      | 12 +++++-------
 ambari-web/app/templates/wizard/step1.hbs               | 12 +++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ef30d78a/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs
index 62c3d14..35677ab 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs
@@ -50,10 +50,8 @@
     <i class="icon-question-sign" rel="skip-validation-tooltip"
        data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.skipValidation.tooltip"}}></i></label>
 </div>
-{{#if App.supports.redhatSatellite}}
-  <div id="use-redhat">
-    <label>{{view Ember.Checkbox classNames="align-checkbox" checkedBinding="view.parentView.useRedhatSatellite"}}{{t installer.step1.advancedRepo.useRedhatSatellite.message}}
-      <i class="icon-question-sign" rel="use-redhat-tooltip"
-         data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.useRedhatSatellite.tooltip"}}></i></label>
-  </div>
-{{/if}}
+<div id="use-redhat">
+  <label>{{view Ember.Checkbox classNames="align-checkbox" checkedBinding="view.parentView.useRedhatSatellite"}}{{t installer.step1.advancedRepo.useRedhatSatellite.message}}
+    <i class="icon-question-sign" rel="use-redhat-tooltip"
+       data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.useRedhatSatellite.tooltip"}}></i></label>
+</div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/ef30d78a/ambari-web/app/templates/wizard/step1.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step1.hbs b/ambari-web/app/templates/wizard/step1.hbs
index e59b76d..ab9a0dd 100644
--- a/ambari-web/app/templates/wizard/step1.hbs
+++ b/ambari-web/app/templates/wizard/step1.hbs
@@ -98,13 +98,11 @@
               <i class="icon-question-sign" rel="skip-validation-tooltip"
                  data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.skipValidation.tooltip"}}></i></label>
           </div>
-          {{#if App.supports.redhatSatellite}}
-            <div id="use-redhat">
-              <label>{{view Ember.Checkbox classNames="align-checkbox" checkedBinding="useRedhatSatellite"}}{{t installer.step1.advancedRepo.useRedhatSatellite.message}}
-                <i class="icon-question-sign" rel="use-redhat-tooltip"
-                   data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.useRedhatSatellite.tooltip"}}></i></label>
-            </div>
-          {{/if}}
+          <div id="use-redhat">
+            <label>{{view Ember.Checkbox classNames="align-checkbox" checkedBinding="useRedhatSatellite"}}{{t installer.step1.advancedRepo.useRedhatSatellite.message}}
+              <i class="icon-question-sign" rel="use-redhat-tooltip"
+                 data-toggle="tooltip" {{translateAttr title="installer.step1.advancedRepo.useRedhatSatellite.tooltip"}}></i></label>
+          </div>
           {{#if view.invalidFormatUrlExist}}
             <div class="alert">{{t installer.step1.attentionNeeded}}</div>
           {{/if}}