ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: Revert "AMBARI-15212 Master component names are missing on service summary page (Joe Wang via rzang)"
Date Tue, 01 Mar 2016 08:16:18 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 8b6fa3931 -> a19cf17ae


Revert "AMBARI-15212 Master component names are missing on service summary page (Joe Wang
via rzang)"

This reverts commit e175f770f99a48ebee07b143a85c2ffbb2a6d99c.


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

Branch: refs/heads/trunk
Commit: a19cf17ae5dd7b18b59929ce0b9b4d8dc53a7eb5
Parents: 8b6fa39
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Tue Mar 1 10:15:59 2016 +0200
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Tue Mar 1 10:15:59 2016 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/global/update_controller.js | 1 -
 ambari-web/app/mappers/service_metrics_mapper.js       | 1 -
 2 files changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a19cf17a/ambari-web/app/controllers/global/update_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/update_controller.js b/ambari-web/app/controllers/global/update_controller.js
index 2256e21..de4523b 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -462,7 +462,6 @@ App.UpdateController = Em.Controller.extend({
         'host_components/HostRoles/stale_configs,' +
         'host_components/HostRoles/ha_state,' +
         'host_components/HostRoles/desired_admin_state,' +
-        'host_components/HostRoles/display_name,' +
         conditionalFieldsString +
         '&minimal_response=true';
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/a19cf17a/ambari-web/app/mappers/service_metrics_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/service_metrics_mapper.js b/ambari-web/app/mappers/service_metrics_mapper.js
index 115c246..9d5c155 100644
--- a/ambari-web/app/mappers/service_metrics_mapper.js
+++ b/ambari-web/app/mappers/service_metrics_mapper.js
@@ -152,7 +152,6 @@ App.serviceMetricsMapper = App.QuickDataMapper.create({
     passive_state: 'HostRoles.maintenance_state',
     display_name: 'HostRoles.display_name',
     component_name: 'HostRoles.component_name',
-    display_name: 'HostRoles.display_name',
     host_id: 'HostRoles.host_name',
     host_name: 'HostRoles.host_name',
     stale_configs: 'HostRoles.stale_configs',


Mime
View raw message