Merge branch 'trunk' into branch-feature-AMBARI-18456
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aa29f56c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aa29f56c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aa29f56c Branch: refs/heads/branch-feature-AMBARI-18456 Commit: aa29f56cb8d5024602717716f6d218a695f92724 Parents: 5dff9ac 41c49e1 Author: Jonathan Hurley <[email protected]> Authored: Mon Oct 17 10:16:43 2016 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Mon Oct 17 10:16:43 2016 -0400 ---------------------------------------------------------------------- .../4.0.0.2.0/package/scripts/service_check.py | 9 +- .../scripts/shared_initialization.py | 2 +- .../stacks/HDP/2.6/services/YARN/metainfo.xml | 4 + .../BlueprintConfigurationProcessorTest.java | 5 ++ ambari-web/app/styles/alerts.less | 14 --- ambari-web/app/styles/application.less | 40 +-------- ambari-web/app/styles/config_history_flow.less | 3 - ambari-web/app/styles/modal_popups.less | 5 +- .../app/styles/theme/bootstrap-ambari.css | 38 ++++----- .../templates/common/configs/overrideWindow.hbs | 34 ++++---- .../common/configs/propertyDependence.hbs | 2 +- .../config_recommendation_popup.hbs | 2 +- .../modal_popups/dependent_configs_list.hbs | 4 +- .../modal_popups/hosts_table_list_popup.hbs | 16 ++-- ambari-web/app/templates/common/settings.hbs | 2 +- ambari-web/app/templates/experimental.hbs | 8 +- .../templates/main/admin/serviceAccounts.hbs | 2 +- .../main/admin/stack_upgrade/services.hbs | 2 +- .../upgrade_configs_merge_table.hbs | 4 +- .../admin/stack_upgrade/upgrade_history.hbs | 2 +- ambari-web/app/templates/main/alerts.hbs | 2 +- .../alerts/add_definition_to_group_popup.hbs | 52 ++++++------ .../main/alerts/definition_details.hbs | 4 +- .../templates/main/dashboard/config_history.hbs | 2 +- ambari-web/app/templates/main/host.hbs | 2 +- .../app/templates/main/host/addHost/step4.hbs | 2 +- .../app/templates/main/host/host_alerts.hbs | 4 +- ambari-web/app/templates/main/host/logs.hbs | 8 +- .../app/templates/main/host/stack_versions.hbs | 2 +- .../main/service/info/configs_save_popup.hbs | 20 +++-- ambari-web/app/templates/main/views.hbs | 4 +- ambari-web/app/templates/wizard/step1.hbs | 16 ++-- ambari-web/app/templates/wizard/step3.hbs | 2 +- ambari-web/app/templates/wizard/step4.hbs | 4 +- ambari-web/app/templates/wizard/step6.hbs | 2 +- .../wizard/step9/step9_install_host_popup.hbs | 2 +- .../app/views/main/alert_definitions_view.js | 4 +- .../MICROSOFT_R/8.0.5/kerberos.json | 15 ---- .../MICROSOFT_R/8.0.5/metainfo.xml | 53 ------------ .../package/files/microsoft_r_serviceCheck.r | 28 ------ .../8.0.5/package/scripts/microsoft_r.py | 38 --------- .../MICROSOFT_R/8.0.5/package/scripts/params.py | 31 ------- .../8.0.5/package/scripts/params_linux.py | 79 ----------------- .../8.0.5/package/scripts/params_windows.py | 26 ------ .../8.0.5/package/scripts/service_check.py | 89 -------------------- .../MICROSOFT_R/8.0.5/role_command_order.json | 6 -- .../MICROSOFT_R/8.0.5/service_advisor.py | 73 ---------------- .../MICROSOFT_R_SERVER/8.0.5/kerberos.json | 15 ++++ .../MICROSOFT_R_SERVER/8.0.5/metainfo.xml | 53 ++++++++++++ .../files/microsoft_r_server_serviceCheck.r | 28 ++++++ .../8.0.5/package/scripts/microsoft_r_server.py | 38 +++++++++ .../8.0.5/package/scripts/params.py | 31 +++++++ .../8.0.5/package/scripts/params_linux.py | 79 +++++++++++++++++ .../8.0.5/package/scripts/params_windows.py | 26 ++++++ .../8.0.5/package/scripts/service_check.py | 89 ++++++++++++++++++++ .../8.0.5/role_command_order.json | 6 ++ .../MICROSOFT_R_SERVER/8.0.5/service_advisor.py | 73 ++++++++++++++++ .../MICROSOFT_R/8.0.5/metainfo.xml | 47 ----------- .../MICROSOFT_R/8.0.5/repos/repoinfo.xml | 40 --------- .../MICROSOFT_R_SERVER/8.0.5/metainfo.xml | 47 +++++++++++ .../MICROSOFT_R_SERVER/8.0.5/repos/repoinfo.xml | 40 +++++++++ .../src/main/resources/mpack.json | 10 +-- 62 files changed, 684 insertions(+), 706 deletions(-) ----------------------------------------------------------------------
