Repository: ambari Updated Branches: refs/heads/branch-2.5 ce8e1bd4a -> 6f63e8426
AMBARI-19560. Timezone for timestamps in Upgrade History not consistent with Background Operations (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6f63e842 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6f63e842 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6f63e842 Branch: refs/heads/branch-2.5 Commit: 6f63e8426c79a59451d05ac4f5628a3163a17679 Parents: ce8e1bd Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Mon Jan 16 11:21:29 2017 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Mon Jan 16 17:43:12 2017 +0200 ---------------------------------------------------------------------- .../app/views/main/admin/stack_upgrade/upgrade_history_view.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6f63e842/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js index f6a419e..2137f46 100644 --- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js +++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js @@ -133,8 +133,8 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM item.setProperties({ directionLabel: direction, upgradeTypeLabel: method ? method.get('displayName') : method, - startTimeLabel: date.startTime(item.get('startTime')), - endTimeLabel: date.startTime(item.get('endTime')), + startTimeLabel: App.dateTimeWithTimeZone(item.get('startTime')), + endTimeLabel: App.dateTimeWithTimeZone(item.get('endTime')), duration: date.durationSummary(item.get('startTime'), item.get('endTime')) }); processedContent.push(item);