Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d22a6711 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d22a6711 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d22a6711 Branch: refs/heads/feature-branch-AMBARI-21307 Commit: d22a671170fa3da68ca284db46c9f9c37321bfed Parents: 4510578 a92d868 Author: ababiichuk <ababiic...@hortonworks.com> Authored: Wed Aug 30 15:16:46 2017 +0300 Committer: ababiichuk <ababiic...@hortonworks.com> Committed: Wed Aug 30 15:16:46 2017 +0300 ---------------------------------------------------------------------- .../controllers/stackVersions/StackVersionsCreateCtrl.js | 1 + .../controllers/stackVersions/StackVersionsEditCtrl.js | 1 + .../resources/ui/admin-web/app/scripts/services/Stack.js | 5 +++-- .../ui/admin-web/app/views/stackVersions/list.html | 1 + .../app/views/stackVersions/stackVersionPage.html | 1 + .../main/admin/stack_and_upgrade_controller.js | 11 +++++++---- ambari-web/app/messages.js | 2 ++ .../app/models/stack_version/repository_version.js | 4 ++++ .../common/modal_popups/install_repo_confirmation.hbs | 2 +- .../main/admin/stack_upgrade/upgrade_version_box.hbs | 7 +++++-- .../main/admin/stack_upgrade/upgrade_version_column.hbs | 6 +++--- .../main/admin/stack_upgrade/upgrade_version_box_view.js | 4 ---- .../app/views/main/admin/stack_upgrade/versions_view.js | 4 ++-- .../main/admin/stack_and_upgrade_controller_test.js | 7 ++++++- 14 files changed, 37 insertions(+), 19 deletions(-) ----------------------------------------------------------------------