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/7bb4de14 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7bb4de14 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7bb4de14 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: 7bb4de14443e1d80ad0c9fd7e01075acae854cb0 Parents: 77d4057 523f505 Author: Robert Levas <[email protected]> Authored: Mon Oct 16 16:22:38 2017 -0400 Committer: Robert Levas <[email protected]> Committed: Mon Oct 16 16:22:38 2017 -0400 ---------------------------------------------------------------------- ambari-infra/ambari-infra-assembly/pom.xml | 4 + .../ambari-logsearch-assembly/pom.xml | 4 +- .../ambari-logsearch-logfeeder/pom.xml | 4 + .../ambari-logsearch-server/pom.xml | 4 + ambari-metrics/ambari-metrics-assembly/pom.xml | 2 + ambari-metrics/ambari-metrics-common/pom.xml | 6 + .../ambari-metrics-timelineservice/pom.xml | 10 ++ .../controller/AmbariManagementController.java | 6 +- .../AmbariManagementControllerImpl.java | 50 ++++---- .../controller/AmbariManagementHelper.java | 26 ++++ .../internal/ExtensionLinkResourceProvider.java | 15 +++ .../AtlasProxyUserConfigCalculation.java | 62 +++++++++ .../ambari/server/stack/ExtensionHelper.java | 31 ++++- .../server/upgrade/UpgradeCatalog260.java | 19 +++ .../package/scripts/accumulo_script.py | 1 + .../0.1.0/package/scripts/metrics_collector.py | 4 +- .../0.1.0/package/scripts/metrics_grafana.py | 4 +- .../0.1.0/package/scripts/metrics_monitor.py | 4 +- .../package/scripts/hive_interactive.py | 13 ++ .../package/scripts/hive_interactive.py | 13 ++ .../package/scripts/supervisord_service.py | 1 + .../package/scripts/supervisord_service.py | 1 + .../ZEPPELIN/0.7.0/package/scripts/master.py | 52 ++++++-- .../ZEPPELIN/0.7.0/package/scripts/params.py | 15 ++- .../HDP/2.0.6/properties/stack_packages.json | 2 +- .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 4 + .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 3 + .../configuration/application-properties.xml | 15 +++ .../stacks/HDP/2.6/services/DRUID/kerberos.json | 45 ++----- .../HDP/2.6/services/SUPERSET/kerberos.json | 10 +- .../stacks/HDP/2.6/services/stack_advisor.py | 7 + .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 4 + .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 3 + .../AtlasProxyUserConfigCalculationTest.java | 127 +++++++++++++++++++ .../server/stack/StackManagerExtensionTest.java | 22 +++- .../stacks/2.5/HIVE/test_hive_server_int.py | 16 +++ .../stacks/2.6/ZEPPELIN/test_zeppelin_070.py | 3 + .../stacks/2.6/common/test_stack_advisor.py | 3 +- .../resources/extensions/EXT/0.2/metainfo.xml | 4 +- .../resources/extensions/EXT/0.4/metainfo.xml | 32 +++++ .../EXT/0.4/services/OOZIE2/metainfo.xml | 118 +++++++++++++++++ .../services/OOZIE2/themes/broken_theme.json | 3 + ambari-utility/pom.xml | 6 + 43 files changed, 675 insertions(+), 103 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7bb4de14/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7bb4de14/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java ----------------------------------------------------------------------
