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/160a6ec2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/160a6ec2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/160a6ec2 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: 160a6ec231e4052c3b7e22d7e03de859cde7ac31 Parents: 698465d cfd0f09 Author: Robert Levas <[email protected]> Authored: Mon Oct 23 11:19:18 2017 -0400 Committer: Robert Levas <[email protected]> Committed: Mon Oct 23 11:19:18 2017 -0400 ---------------------------------------------------------------------- .../before-ANY/files/changeToSecureUid.sh | 2 +- .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 4 +- .../stacks/HDP/2.4/upgrades/config-upgrade.xml | 4 +- .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 4 +- .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 4 +- ambari-web/app/assets/test/tests.js | 1 + .../app/models/alerts/alert_definition.js | 18 +- ambari-web/app/routes/main.js | 1 + ambari-web/app/styles/hosts.less | 89 +++--- .../app/styles/theme/bootstrap-ambari.css | 2 +- ambari-web/app/styles/visualsearch.less | 100 ++++++ ambari-web/app/templates/main/alerts.hbs | 19 +- .../alert_definition_summary.hbs | 2 +- ambari-web/app/templates/main/host.hbs | 26 +- .../templates/main/host/combo_search_box.hbs | 9 +- ambari-web/app/views.js | 1 + ambari-web/app/views/common/table_view.js | 11 + .../app/views/main/alert_definitions_view.js | 264 --------------- .../alert_definition_summary.js | 2 +- .../app/views/main/alerts/alert_search_box.js | 318 +++++++++++++++++++ .../app/views/main/host/combo_search_box.js | 8 + ambari-web/test/init_test.js | 8 + .../views/main/alert_definitions_view_test.js | 152 --------- .../views/main/alerts/alert_search_box_test.js | 232 ++++++++++++++ .../vendor/scripts/theme/bootstrap-ambari.js | 30 +- 25 files changed, 785 insertions(+), 526 deletions(-) ----------------------------------------------------------------------
