Merge branch 'trunk' into branch-dev-patch-upgrade
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/50547c5e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/50547c5e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/50547c5e Branch: refs/heads/trunk Commit: 50547c5ed6076a6fdd18830b179cd28411288496 Parents: 55342fc 9310ab7 Author: Nate Cole <nc...@hortonworks.com> Authored: Tue Feb 23 09:06:59 2016 -0500 Committer: Nate Cole <nc...@hortonworks.com> Committed: Tue Feb 23 09:06:59 2016 -0500 ---------------------------------------------------------------------- .../server/upgrade/UpgradeCatalog222.java | 19 +++ .../HAWQ/2.0.0/configuration/hawq-env.xml | 2 +- .../PXF/3.0.0/package/scripts/params.py | 1 + .../PXF/3.0.0/package/scripts/pxf_constants.py | 3 + .../PXF/3.0.0/package/scripts/service_check.py | 167 ++++++++++--------- .../stacks/HDP/2.2/services/stack_advisor.py | 6 +- .../stacks/HDP/2.3/services/stack_advisor.py | 2 + .../services/HIVE/configuration/hive-site.xml | 6 + .../stacks/HDPWIN/2.2/services/stack_advisor.py | 35 +++- .../server/upgrade/UpgradeCatalog222Test.java | 80 ++++++--- .../stacks/2.2/common/test_stack_advisor.py | 4 +- .../stacks/2.3/common/test_stack_advisor.py | 103 +++++++++++- .../alerts/definition_configs_controller.js | 16 +- ambari-web/app/controllers/main/host.js | 2 - .../controllers/main/service/info/summary.js | 7 +- ambari-web/app/data/HDP2.3/site_properties.js | 7 + ambari-web/app/data/host/categories.js | 11 -- .../mappers/alert_definition_summary_mapper.js | 23 +++ ambari-web/app/models/alerts/alert_config.js | 13 -- ambari-web/app/models/host_component.js | 12 ++ ambari-web/app/styles/alerts.less | 29 ++-- .../alerts/configs/alert_config_parameter.hbs | 10 +- ambari-web/app/templates/main/menu_item.hbs | 5 - .../service/info/summary/master_components.hbs | 8 + ambari-web/app/views/main/menu.js | 8 +- contrib/views/files/src/main/resources/view.xml | 8 + .../jobs/ResultsPaginationController.java | 7 +- contrib/views/hive/src/main/resources/view.xml | 9 + contrib/views/pig/src/main/resources/view.xml | 9 + .../ambari/view/tez/utils/ProxyHelper.java | 7 +- .../view/utils/hdfs/ConfigurationBuilder.java | 6 + dev-support/docker/docker/bin/ambaribuild.py | 4 +- 32 files changed, 452 insertions(+), 177 deletions(-) ----------------------------------------------------------------------