You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/11/28 21:20:43 UTC
[24/24] ambari git commit: Merge branch 'branch-feature-AMBARI-22457'
into branch-2.6
Merge branch 'branch-feature-AMBARI-22457' into branch-2.6
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c43673f6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c43673f6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c43673f6
Branch: refs/heads/branch-2.6
Commit: c43673f69a150f07cc25821ecaede025f7d003e2
Parents: 754b1f6 ed50bc3
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Tue Nov 28 15:45:00 2017 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Tue Nov 28 15:45:00 2017 -0500
----------------------------------------------------------------------
.../stackVersions/StackVersionsEditCtrl.js | 27 ++++-
.../ui/admin-web/app/scripts/services/Stack.js | 14 +++
.../views/stackVersions/stackVersionPage.html | 28 +++--
.../libraries/functions/__init__.py | 2 +-
.../libraries/functions/copy_tarball.py | 99 ++++++++++++++-
.../libraries/functions/get_lzo_packages.py | 50 --------
.../libraries/functions/lzo_utils.py | 93 +++++++++++++++
.../libraries/functions/package_conditions.py | 8 +-
.../ambari/server/agent/ExecutionCommand.java | 1 +
.../stackadvisor/StackAdvisorRequest.java | 19 +++
.../commands/StackAdvisorCommand.java | 2 +
.../apache/ambari/server/checks/LZOCheck.java | 6 +-
.../server/configuration/Configuration.java | 12 ++
.../AmbariCustomCommandExecutionHelper.java | 14 +--
.../AmbariManagementControllerImpl.java | 8 +-
.../ambari/server/controller/AmbariServer.java | 3 +-
.../server/controller/RepositoryResponse.java | 23 +++-
.../internal/BlueprintResourceProvider.java | 36 +++---
.../internal/ClientConfigResourceProvider.java | 2 +
.../internal/RepositoryResourceProvider.java | 11 +-
.../internal/StackAdvisorResourceProvider.java | 9 +-
.../VersionDefinitionResourceProvider.java | 8 ++
.../server/orm/entities/RepositoryEntity.java | 20 ++++
.../apache/ambari/server/stack/RepoUtil.java | 1 +
.../ambari/server/state/RepositoryInfo.java | 24 +++-
.../ambari/server/state/stack/RepoTag.java | 34 ++++++
.../server/state/stack/RepositoryXml.java | 17 ++-
.../stack/upgrade/RepositoryVersionHelper.java | 19 +++
.../ambari/server/topology/Blueprint.java | 40 +++----
.../ambari/server/topology/BlueprintImpl.java | 18 +--
.../server/topology/BlueprintValidator.java | 5 +-
.../server/topology/BlueprintValidatorImpl.java | 23 +++-
.../GPLLicenseNotAcceptedException.java | 28 +++++
.../server/upgrade/AbstractUpgradeCatalog.java | 8 ++
.../server/upgrade/SchemaUpgradeHelper.java | 27 +++++
.../ambari/server/upgrade/UpgradeCatalog.java | 6 +
.../server/upgrade/UpgradeCatalog261.java | 119 +++++++++++++++++++
ambari-server/src/main/python/ambari-server.py | 2 +
.../python/ambari_server/serverConfiguration.py | 40 ++++++-
.../main/python/ambari_server/serverSetup.py | 10 +-
.../main/python/ambari_server/serverUpgrade.py | 18 ++-
.../common-services/HDFS/2.1.0.2.0/metainfo.xml | 30 -----
.../HDFS/2.1.0.2.0/package/scripts/hdfs.py | 6 +-
.../2.1.0.2.0/package/scripts/install_params.py | 10 --
.../2.1.0.2.0/package/scripts/params_linux.py | 7 --
.../HIVE/0.12.0.2.0/package/scripts/hive.py | 4 +
.../OOZIE/4.0.0.2.0/package/scripts/oozie.py | 47 ++++----
.../4.0.0.2.0/package/scripts/params_linux.py | 8 +-
.../TEZ/0.4.0.2.1/package/scripts/tez.py | 5 +-
.../configuration-mapred/mapred-site.xml | 2 +-
.../YARN/2.1.0.2.0/package/scripts/yarn.py | 3 +
.../BigInsights/4.0/services/HDFS/metainfo.xml | 17 ---
.../BigInsights/4.2/services/HDFS/metainfo.xml | 20 ----
.../4.2/services/HDFS/package/scripts/hdfs.py | 5 +-
.../4.2/services/HIVE/package/scripts/hive.py | 3 +
.../4.2/services/OOZIE/package/scripts/oozie.py | 12 +-
.../services/OOZIE/package/scripts/params.py | 28 +----
.../4.2/services/YARN/package/scripts/yarn.py | 3 +
.../stacks/HDP/2.0.6/services/stack_advisor.py | 41 ++++++-
.../stacks/HDP/2.2/services/HDFS/metainfo.xml | 35 ------
.../2.2/services/TEZ/configuration/tez-site.xml | 4 +-
.../YARN/configuration-mapred/mapred-site.xml | 2 +-
.../stacks/HDP/2.3/services/HDFS/metainfo.xml | 30 -----
.../stacks/HDP/2.6/upgrades/config-upgrade.xml | 6 +-
.../src/main/resources/stacks/stack_advisor.py | 9 ++
.../src/main/resources/version_definition.xsd | 23 +++-
.../ambari/server/checks/LZOCheckTest.java | 13 +-
.../AmbariManagementControllerImplTest.java | 3 +-
.../ClientConfigResourceProviderTest.java | 2 +
.../RepositoryResourceProviderTest.java | 15 ++-
.../ValidationResourceProviderTest.java | 4 +-
.../state/repository/VersionDefinitionTest.java | 35 +++++-
.../upgrade/RepositoryVersionHelperTest.java | 2 +-
.../server/topology/BlueprintImplTest.java | 87 ++++++++++++--
.../topology/BlueprintValidatorImplTest.java | 18 +--
.../src/test/python/TestAmbariServer.py | 7 +-
.../stacks/2.0.6/common/test_stack_advisor.py | 33 +++++
.../stacks/2.2/configs/oozie-upgrade.json | 3 +-
.../resources/version_definition_with_tags.xml | 86 ++++++++++++++
ambari-web/app/controllers/installer.js | 53 +++++----
.../app/controllers/wizard/step8_controller.js | 12 +-
.../app/mappers/repository_version_mapper.js | 3 +-
ambari-web/app/mappers/stack_mapper.js | 3 +-
ambari-web/app/models/repository.js | 17 +++
.../app/models/stack_version/repository.js | 3 +-
ambari-web/app/templates/wizard/step1.hbs | 2 +
ambari-web/test/controllers/installer_test.js | 14 ++-
contrib/version-builder/version_builder.py | 13 +-
88 files changed, 1259 insertions(+), 463 deletions(-)
----------------------------------------------------------------------