Merge remote-tracking branch 'origin/trunk' into origin-trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c4f1e16a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c4f1e16a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c4f1e16a Branch: refs/heads/branch-alerts-dev Commit: c4f1e16a74f6afb1d5b9fb12f7257ad2bb554edb Parents: 9f6b7b3 f2f5dff Author: Oleg Nechiporenko <[email protected]> Authored: Thu Aug 28 19:05:02 2014 +0300 Committer: Oleg Nechiporenko <[email protected]> Committed: Thu Aug 28 19:05:02 2014 +0300 ---------------------------------------------------------------------- .../resource_management/TestPackageResource.py | 6 +- .../core/providers/package/apt.py | 11 +- .../ambari/server/api/query/QueryImpl.java | 1 - .../resources/ResourceInstanceFactoryImpl.java | 4 + ...ackLevelConfigurationResourceDefinition.java | 53 ++++++ .../StackVersionResourceDefinition.java | 1 + .../server/api/services/AmbariMetaInfo.java | 34 +++- .../server/api/services/StacksService.java | 35 +++- .../server/api/util/StackExtensionHelper.java | 105 ++++++++--- .../controller/AmbariManagementController.java | 8 + .../AmbariManagementControllerImpl.java | 44 +++++ .../StackLevelConfigurationRequest.java | 42 +++++ .../StackLevelConfigurationResponse.java | 37 ++++ .../server/controller/StackVersionResponse.java | 14 +- .../AbstractControllerResourceProvider.java | 2 + ...StackLevelConfigurationResourceProvider.java | 159 ++++++++++++++++ .../internal/StackVersionResourceProvider.java | 6 + .../ambari/server/controller/spi/Resource.java | 4 +- .../apache/ambari/server/state/ServiceInfo.java | 1 + .../apache/ambari/server/state/StackInfo.java | 26 ++- .../src/main/resources/key_properties.json | 5 + .../src/main/resources/properties.json | 11 ++ .../HDP/1.3.2/configuration/cluster-env.xml | 49 +++++ .../HDP/2.0.6/configuration/cluster-env.xml | 49 +++++ .../ambari/server/api/query/QueryImplTest.java | 2 +- .../api/util/StackExtensionHelperTest.java | 23 +-- .../internal/AbstractResourceProviderTest.java | 45 +++++ ...kLevelConfigurationResourceProviderTest.java | 181 +++++++++++++++++++ .../controllers/main/service/add_controller.js | 24 +-- .../app/controllers/wizard/step8_controller.js | 12 +- ambari-web/app/routes/add_host_routes.js | 2 + ambari-web/app/routes/add_service_routes.js | 2 + ambari-web/app/routes/installer.js | 2 + .../main/service/add_controller_test.js | 10 + 34 files changed, 939 insertions(+), 71 deletions(-) ----------------------------------------------------------------------
