You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2016/06/07 12:59:35 UTC
[1/2] ambari git commit: AMBARI-17064 Add Service Wizard-> Install,
Start and Test page: Host row does not have message link. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 16b223474 -> c9364fadb
AMBARI-17064 Add Service Wizard-> Install, Start and Test page: Host row does not have message link. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6ab48a9c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6ab48a9c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6ab48a9c
Branch: refs/heads/branch-2.4
Commit: 6ab48a9caf467214edf98c3138b3844c59757437
Parents: 16b2234
Author: ababiichuk <ab...@hortonworks.com>
Authored: Mon Jun 6 19:07:39 2016 +0300
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Tue Jun 7 15:59:12 2016 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step9_controller.js | 2 ++
ambari-web/app/utils/helper.js | 1 +
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab48a9c/ambari-web/app/controllers/wizard/step9_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step9_controller.js b/ambari-web/app/controllers/wizard/step9_controller.js
index 015cb84..41ae920 100644
--- a/ambari-web/app/controllers/wizard/step9_controller.js
+++ b/ambari-web/app/controllers/wizard/step9_controller.js
@@ -421,6 +421,8 @@ App.WizardStep9Controller = Em.Controller.extend(App.ReloadPopupMixin, {
return role + Em.I18n.t('installer.step9.serviceStatus.stop.failed');
}
break;
+ case 'CUSTOM_COMMAND':
+ role = App.format.commandDetail(task.command_detail, task.request_input);
case 'EXECUTE' :
case 'SERVICE_CHECK' :
switch (task.status) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab48a9c/ambari-web/app/utils/helper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js
index 7ab131c..3fd7f4a 100644
--- a/ambari-web/app/utils/helper.js
+++ b/ambari-web/app/utils/helper.js
@@ -518,6 +518,7 @@ App.format = {
'UPGRADE': 'Upgrade',
'RESTART': 'Restart',
'SERVICE_CHECK': 'Check',
+ 'SET_KEYTAB': 'Set Keytab:',
'Excluded:': 'Decommission:',
'Included:': 'Recommission:'
},
[2/2] ambari git commit: AMBARI-17094 Admin View: edit remote cluster
page broken. (ababiichuk)
Posted by ab...@apache.org.
AMBARI-17094 Admin View: edit remote cluster page broken. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c9364fad
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c9364fad
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c9364fad
Branch: refs/heads/branch-2.4
Commit: c9364fadb3cc939b8293a170fdf0945755bd7933
Parents: 6ab48a9
Author: ababiichuk <ab...@hortonworks.com>
Authored: Tue Jun 7 15:56:08 2016 +0300
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Tue Jun 7 15:59:22 2016 +0300
----------------------------------------------------------------------
ambari-admin/src/main/resources/ui/admin-web/app/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c9364fad/ambari-admin/src/main/resources/ui/admin-web/app/index.html
----------------------------------------------------------------------
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/index.html b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
index 11e0a2e..25379c1 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/index.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
@@ -166,7 +166,7 @@
<script src="scripts/services/PermissionLoader.js"></script>
<script src="scripts/services/PermissionsSaver.js"></script>
<script src="scripts/services/ConfirmationModal.js"></script>
-<script src="scripts/services/deregisterClusterModal.js"></script>
+<script src="scripts/services/DeregisterClusterModal.js"></script>
<script src="scripts/services/Auth.js"></script>
<script src="scripts/services/GetDifference.js"></script>
<script src="scripts/services/UnsavedDialog.js"></script>