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/ef96465f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ef96465f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ef96465f Branch: refs/heads/branch-feature-AMBARI-12556 Commit: ef96465fa51f7cdf469cc1411bcf92250017145a Parents: f6bc797 3e648bb Author: Nate Cole <[email protected]> Authored: Thu Mar 2 13:41:37 2017 -0500 Committer: Nate Cole <[email protected]> Committed: Thu Mar 2 13:41:37 2017 -0500 ---------------------------------------------------------------------- .../server/orm/InMemoryDefaultTestModule.java | 11 +- ambari-server/pom.xml | 1 + .../ambari/server/audit/AuditLoggerModule.java | 13 +- .../server/cleanup/ClasspathScannerUtils.java | 19 +- .../ambari/server/cleanup/CleanupModule.java | 13 +- .../server/controller/ControllerModule.java | 103 +++++---- .../internal/ClusterResourceProvider.java | 2 + .../listeners/upgrade/StackVersionListener.java | 2 +- .../InternalAuthenticationInterceptor.java | 51 +++++ .../RunWithInternalSecurityContext.java | 36 ++++ .../ambari/server/topology/AmbariContext.java | 7 +- .../server/topology/HostOfferResponse.java | 2 +- .../ambari/server/topology/HostRequest.java | 178 ++-------------- .../server/topology/PersistedStateImpl.java | 1 + .../ambari/server/topology/TopologyManager.java | 101 +-------- .../ambari/server/topology/TopologyTask.java | 47 ---- .../topology/tasks/ConfigureClusterTask.java | 122 +++++++++++ .../tasks/ConfigureClusterTaskFactory.java | 30 +++ .../server/topology/tasks/InstallHostTask.java | 70 ++++++ .../tasks/PersistHostResourcesTask.java | 59 ++++++ .../tasks/RegisterWithConfigGroupTask.java | 50 +++++ .../server/topology/tasks/StartHostTask.java | 67 ++++++ .../server/topology/tasks/TopologyHostTask.java | 59 ++++++ .../server/topology/tasks/TopologyTask.java | 42 ++++ .../server/upgrade/UpgradeCatalog250.java | 14 ++ .../0.9.2/configuration/druid-superset-env.xml | 3 + .../HIVE/configuration/hive-interactive-env.xml | 4 +- .../HIVE/configuration/hive-interactive-env.xml | 4 +- .../ambari/server/agent/AgentResourceTest.java | 3 + .../UpgradeResourceProviderHDP22Test.java | 34 +-- .../internal/UpgradeResourceProviderTest.java | 26 +-- .../internal/WidgetResourceProviderTest.java | 27 ++- .../server/orm/InMemoryDefaultTestModule.java | 8 +- .../server/state/cluster/ClustersTest.java | 2 +- .../ClusterDeployWithStartOnlyTest.java | 3 + ...InstallWithoutStartOnComponentLevelTest.java | 3 + .../ClusterInstallWithoutStartTest.java | 3 + .../topology/ConfigureClusterTaskTest.java | 7 +- .../server/topology/TopologyManagerTest.java | 3 + .../server/upgrade/UpgradeCatalog250Test.java | 10 +- .../ambari/server/utils/StageUtilsTest.java | 2 + ...test_kerberos_descriptor_2_5_infra_solr.json | 212 ++++++++++++++++++- ambari-web/app/mappers/hosts_mapper.js | 2 +- ambari-web/app/routes/main.js | 25 ++- .../app/views/common/quick_view_link_view.js | 4 + .../generators/AnalyzeTableQueryGenerator.java | 45 ++-- .../resources/ui/app/routes/queries/query.js | 14 +- .../AnalyzeTableQueryGeneratorSpecTest.groovy | 8 +- .../ui/app/domain/workflow-xml-generator.js | 4 +- .../app/validators/duplicate-data-node-name.js | 2 +- pom.xml | 1 - 51 files changed, 1057 insertions(+), 502 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ef96465f/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java ----------------------------------------------------------------------
