You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/06/09 21:08:40 UTC
[3/3] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-20859
Merge branch 'trunk' into branch-feature-AMBARI-20859
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eaa2e0f4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eaa2e0f4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eaa2e0f4
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: eaa2e0f45b86d223c779739ee78e5d184062177e
Parents: ebe3939 2bea120
Author: Robert Levas <rl...@hortonworks.com>
Authored: Fri Jun 9 17:08:27 2017 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Fri Jun 9 17:08:27 2017 -0400
----------------------------------------------------------------------
.../main/admin/highAvailability/progress_popup_controller.js | 2 +-
.../app/controllers/main/admin/stack_and_upgrade_controller.js | 2 +-
ambari-web/app/messages.js | 3 ---
ambari-web/app/templates/main.hbs | 2 +-
ambari-web/app/utils/ajax/ajax.js | 2 +-
.../app/views/common/configs/service_config_container_view.js | 2 +-
ambari-web/app/views/loading.js | 2 +-
ambari-web/app/views/main/alerts/definition_details_view.js | 2 +-
ambari-web/test/views/main/alerts/definition_details_view_test.js | 2 +-
9 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------