Merge branch 'trunk' into branch-feature-AMBARI-12556
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1427d818 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1427d818 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1427d818 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 1427d818b41a987767c3261e586368e47c43822c Parents: 522039e 47b845f Author: Jonathan Hurley <[email protected]> Authored: Tue May 16 13:14:41 2017 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Tue May 16 13:14:41 2017 -0400 ---------------------------------------------------------------------- ambari-infra/ambari-infra-assembly/pom.xml | 89 +++ .../src/main/package/deb/manager/control | 22 + .../src/main/package/deb/manager/postinst | 15 + .../src/main/package/deb/manager/postrm | 15 + .../src/main/package/deb/manager/preinst | 15 + .../src/main/package/deb/manager/prerm | 15 + ambari-infra/ambari-infra-manager/build.xml | 53 ++ ambari-infra/ambari-infra-manager/pom.xml | 43 +- .../org/apache/ambari/infra/InfraManager.java | 1 - .../conf/batch/InfraManagerBatchConfig.java | 2 +- .../src/main/resources/infraManager.sh | 20 + ambari-logsearch/README.md | 3 +- ambari-logsearch/ambari-logsearch-it/pom.xml | 10 + .../logsearch/steps/AbstractLogSearchSteps.java | 3 +- .../story/LogSearchBackendStories.java | 19 +- .../logsearch/story/LogSearchStoryLocator.java | 97 +++ .../logsearch/story/LogSearchUIStories.java | 15 +- .../backend/log_search_api_query_story.story | 17 - .../stories/backend/log_search_api_tests.story | 17 + .../backend/logfeeder_parsing_story.story | 20 - .../backend/logfeeder_parsing_tests.story | 20 + ambari-server/pom.xml | 1 - .../gsinstaller/ClusterDefinition.java | 434 ------------ .../gsinstaller/GSInstallerClusterProvider.java | 71 -- .../GSInstallerComponentProvider.java | 88 --- .../GSInstallerHostComponentProvider.java | 99 --- .../gsinstaller/GSInstallerHostProvider.java | 86 --- .../gsinstaller/GSInstallerNoOpProvider.java | 60 -- .../gsinstaller/GSInstallerProviderModule.java | 93 --- .../GSInstallerResourceProvider.java | 234 ------- .../gsinstaller/GSInstallerServiceProvider.java | 82 --- .../gsinstaller/GSInstallerStateProvider.java | 35 - .../internal/StageResourceProvider.java | 81 +-- .../RANGER_KMS/0.5.0.3.0/alerts.json | 32 + .../0.5.0.3.0/configuration/dbks-site.xml | 206 ++++++ .../0.5.0.3.0/configuration/kms-env.xml | 116 ++++ .../0.5.0.3.0/configuration/kms-log4j.xml | 120 ++++ .../0.5.0.3.0/configuration/kms-properties.xml | 166 +++++ .../0.5.0.3.0/configuration/kms-site.xml | 133 ++++ .../configuration/ranger-kms-audit.xml | 124 ++++ .../configuration/ranger-kms-policymgr-ssl.xml | 68 ++ .../configuration/ranger-kms-security.xml | 64 ++ .../0.5.0.3.0/configuration/ranger-kms-site.xml | 104 +++ .../RANGER_KMS/0.5.0.3.0/kerberos.json | 84 +++ .../RANGER_KMS/0.5.0.3.0/metainfo.xml | 115 ++++ .../RANGER_KMS/0.5.0.3.0/package/scripts/kms.py | 677 +++++++++++++++++++ .../0.5.0.3.0/package/scripts/kms_server.py | 117 ++++ .../0.5.0.3.0/package/scripts/kms_service.py | 58 ++ .../0.5.0.3.0/package/scripts/params.py | 331 +++++++++ .../0.5.0.3.0/package/scripts/service_check.py | 41 ++ .../0.5.0.3.0/package/scripts/status_params.py | 36 + .../0.5.0.3.0/package/scripts/upgrade.py | 30 + .../templates/input.config-ranger-kms.json.j2 | 48 ++ .../0.5.0.3.0/role_command_order.json | 7 + .../RANGER_KMS/0.5.0.3.0/service_advisor.py | 281 ++++++++ .../0.5.0.3.0/themes/theme_version_1.json | 303 +++++++++ .../0.5.0.3.0/themes/theme_version_2.json | 124 ++++ .../SPARK/1.2.1/quicklinks/quicklinks.json | 1 + .../0.9.1/package/templates/storm_jaas.conf.j2 | 8 + .../custom_actions/scripts/ru_execute_tasks.py | 2 + .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 8 + .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 6 + .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 + .../stacks/HDP/2.4/upgrades/config-upgrade.xml | 6 +- .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 6 + .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 + .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 12 +- .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 6 + .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 4 + .../HIVE/configuration/tez-interactive-site.xml | 12 + .../services/YARN/configuration/yarn-site.xml | 9 + .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 8 + .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 7 + .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 4 + .../HDP/3.0/services/RANGER_KMS/metainfo.xml | 27 + .../GSInstallerClusterProviderTest.java | 104 --- .../GSInstallerComponentProviderTest.java | 102 --- .../GSInstallerHostComponentProviderTest.java | 149 ---- .../GSInstallerHostProviderTest.java | 153 ----- .../GSInstallerNoOpProviderTest.java | 46 -- .../GSInstallerServiceProviderTest.java | 166 ----- .../TestGSInstallerStateProvider.java | 36 - .../admin/stack_upgrade/upgrade_version_box.hbs | 3 + .../stack_upgrade/upgrade_version_box_view.js | 2 + .../step7/assign_master_controller_test.js | 40 +- ambari-web/test/utils/helper_test.js | 6 +- 86 files changed, 4001 insertions(+), 2194 deletions(-) ----------------------------------------------------------------------
