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/803f44ba Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/803f44ba Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/803f44ba Branch: refs/heads/trunk Commit: 803f44ba5f7411d9421b44dbacaa48f81ce3edc6 Parents: 3bbe75c 8fbc271 Author: Jonathan Hurley <[email protected]> Authored: Mon Dec 5 15:21:25 2016 -0500 Committer: Jonathan Hurley <[email protected]> Committed: Mon Dec 5 15:21:25 2016 -0500 ---------------------------------------------------------------------- .../libraries/functions/constants.py | 1 + .../libraries/functions/setup_atlas_hook.py | 47 +- .../BlueprintConfigurationProcessor.java | 3 +- .../ambari/server/topology/TopologyManager.java | 19 +- .../server/upgrade/UpgradeCatalog250.java | 30 + .../src/main/python/ambari_server_main.py | 8 +- .../0.5.0.2.1/configuration/falcon-env.xml | 17 + .../FALCON/0.5.0.2.1/metainfo.xml | 7 + .../FALCON/0.5.0.2.1/package/scripts/falcon.py | 2 +- .../0.5.0.2.1/package/scripts/params_linux.py | 5 +- .../FALCON/0.5.0.2.1/quicklinks/quicklinks.json | 35 + .../HIVE/0.12.0.2.0/configuration/hive-env.xml | 17 + .../HIVE/0.12.0.2.0/package/scripts/hcat.py | 2 +- .../HIVE/0.12.0.2.0/package/scripts/hive.py | 2 +- .../0.12.0.2.0/package/scripts/params_linux.py | 5 +- .../HIVE/0.12.0.2.0/package/scripts/webhcat.py | 2 +- .../RANGER/0.4.0/package/scripts/params.py | 1 + .../0.4.0/package/scripts/ranger_admin.py | 36 +- .../SQOOP/1.4.4.2.0/configuration/sqoop-env.xml | 17 + .../1.4.4.2.0/configuration/sqoop-site.xml | 6 + .../1.4.4.2.0/package/scripts/params_linux.py | 5 +- .../SQOOP/1.4.4.2.0/package/scripts/sqoop.py | 2 +- .../STORM/0.10.0/configuration/storm-env.xml | 17 + .../STORM/0.9.1/package/scripts/params_linux.py | 6 +- .../STORM/0.9.1/package/scripts/storm.py | 2 +- .../scripts/post-user-creation-hook.sh | 7 + .../HDP/2.0.6/properties/stack_features.json | 5 + .../services/HIVE/configuration/hive-site.xml | 4 + .../services/STORM/configuration/storm-site.xml | 4 + .../stacks/HDP/2.3/services/stack_advisor.py | 57 +- .../stacks/HDP/2.5/services/stack_advisor.py | 6 - .../BlueprintConfigurationProcessorTest.java | 11 + .../server/upgrade/UpgradeCatalog250Test.java | 93 +++ .../stacks/2.3/common/test_stack_advisor.py | 28 +- .../stacks/2.6/RANGER/test_ranger_admin.py | 504 ++++++++++++ .../2.6/configs/ranger-admin-default.json | 704 +++++++++++++++++ .../2.6/configs/ranger-admin-secured.json | 773 +++++++++++++++++++ ambari-web/app/styles/wizard.less | 6 +- .../common/configs/notifications_configs.hbs | 2 +- ambari-web/app/templates/wizard/step1.hbs | 2 +- .../notification_configs_view.js | 18 +- .../configs/service_configs_by_category_view.js | 9 +- ambari-web/app/views/wizard/step1_view.js | 21 +- .../widgets/slider_config_widget_view_test.js | 23 - .../test/views/main/dashboard/widgets_test.js | 2 +- contrib/utils/perf/deploy-gce-perf-cluster.py | 10 +- .../src/main/resources/view.xml | 23 +- contrib/views/files/src/main/resources/view.xml | 7 + .../views/hive-next/src/main/resources/view.xml | 7 + contrib/views/tez/src/main/resources/view.xml | 7 + 50 files changed, 2502 insertions(+), 125 deletions(-) ----------------------------------------------------------------------
