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/04/24 02:21:20 UTC
[38/45] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-12556
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/a33040af
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a33040af
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a33040af
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: a33040afcd6cf963b3b3e2e9770ef051999776ff
Parents: 3bd91a2 84d2b3a
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Fri Apr 21 12:35:21 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Fri Apr 21 12:35:21 2017 -0400
----------------------------------------------------------------------
.../src/main/python/ambari_agent/Hardware.py | 2 +
.../src/main/python/ambari_agent/hostname.py | 8 +
.../libraries/functions/stack_select.py | 5 -
.../libraries/functions/stack_tools.py | 10 -
.../libraries/functions/version_select_util.py | 2 -
.../libraries/script/script.py | 6 +-
.../configurer/SolrCollectionConfigurer.java | 4 +-
.../handler/AbstractSolrConfigHandler.java | 116 +
.../logsearch/handler/UpgradeSchemaHandler.java | 139 +
.../handler/UploadConfigurationHandler.java | 136 +-
...rchExternalServerAuthenticationProvider.java | 5 +-
.../ambari/server/agent/ExecutionCommand.java | 11 -
.../AmbariCustomCommandExecutionHelper.java | 8 +-
.../AmbariManagementControllerImpl.java | 1 -
.../internal/ClientConfigResourceProvider.java | 1 -
.../ambari/server/stack/StackDirectory.java | 4 +
.../server/upgrade/AbstractUpgradeCatalog.java | 3 -
.../server/upgrade/UpgradeCatalog212.java | 3 -
.../server/upgrade/UpgradeCatalog251.java | 13 +
.../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 14 +-
.../ATLAS/0.1.0.2.3/package/scripts/params.py | 3 +
.../logsearch-common-properties.xml | 23 +
.../LOGSEARCH/0.5.0/package/scripts/params.py | 10 +-
.../0.5.0/package/scripts/service_check.py | 9 +-
.../common-services/SPARK/2.2.0/metainfo.xml | 13 +-
.../SPARK/2.2.0/scripts/job_history_server.py | 8 +-
.../SPARK/2.2.0/scripts/livy_server.py | 8 +-
.../SPARK/2.2.0/scripts/params.py | 18 +-
.../SPARK/2.2.0/scripts/spark_client.py | 8 +-
.../SPARK/2.2.0/scripts/spark_service.py | 9 +-
.../SPARK/2.2.0/scripts/spark_thrift_server.py | 8 +-
.../YARN/2.1.0.2.0/package/scripts/yarn.py | 36 +-
.../common-services/YARN/3.0.0.3.0/metainfo.xml | 4 +-
.../YARN/3.0.0.3.0/package/scripts/yarn.py | 36 +-
.../scripts/shared_initialization.py | 5 +-
.../HDP/2.0.6/properties/stack_features.json | 11 +
.../stacks/HDP/2.3/upgrades/config-upgrade.xml | 7 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 7 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 5 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 5 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 5 +
.../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 6 +
.../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 3 +-
.../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 3 +-
.../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 3 +-
.../stacks/HDP/2.4/upgrades/config-upgrade.xml | 6 +
.../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 5 +
.../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 4 +
.../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 6 +-
.../stacks/HDP/2.4/upgrades/upgrade-2.4.xml | 6 +
.../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 1 +
.../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 +
.../stacks/HDP/2.5/upgrades/config-upgrade.xml | 250 +-
.../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 5 +
.../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 4 +
.../stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 6 +
.../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 +
.../services/ATLAS/configuration/atlas-env.xml | 41 +
.../stacks/HDP/2.6/upgrades/config-upgrade.xml | 6 +
.../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 4 +
.../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 +
.../services/HDFS/configuration/hadoop-env.xml | 2 +-
.../YARN/configuration-mapred/mapred-env.xml | 2 +-
.../YARN/configuration-mapred/mapred-site.xml | 12 +-
.../AmbariCustomCommandExecutionHelperTest.java | 1 -
.../AmbariManagementControllerTest.java | 4 +-
.../ambari/server/stack/StackManagerTest.java | 6 +-
.../ambari/server/state/UpgradeHelperTest.java | 33 +-
.../server/upgrade/UpgradeCatalog212Test.java | 34 +-
.../stacks/2.0.6/YARN/test_historyserver.py | 198 +-
.../stacks/2.0.6/YARN/test_nodemanager.py | 196 +-
.../stacks/2.0.6/YARN/test_resourcemanager.py | 52 +-
.../stacks/2.1/YARN/test_apptimelineserver.py | 40 +-
.../test/python/stacks/2.3/YARN/test_ats_1_5.py | 98 +-
.../stacks/2.4/LOGSEARCH/test_logfeeder.py | 1 +
.../stacks/2.4/LOGSEARCH/test_logsearch.py | 3 +-
.../test/python/stacks/2.4/configs/default.json | 3 +
.../HDP/2.2.0/upgrades/upgrade_test_checks.xml | 21 +-
.../app/controllers/wizard/step1_controller.js | 7 +
.../wizard/step7/assign_master_controller.js | 275 +-
ambari-web/app/mappers/stack_mapper.js | 1 +
ambari-web/app/models/stack.js | 1 +
ambari-web/app/styles/wizard.less | 3 +
.../stack_upgrade/stack_upgrade_wizard.hbs | 16 +-
ambari-web/app/templates/wizard/step1.hbs | 6 +-
ambari-web/app/templates/wizard/step10.hbs | 2 +-
ambari-web/app/templates/wizard/step3.hbs | 2 +-
ambari-web/app/templates/wizard/step4.hbs | 4 +-
ambari-web/app/templates/wizard/step6.hbs | 4 +-
ambari-web/app/templates/wizard/step7.hbs | 4 +-
ambari-web/app/templates/wizard/step8.hbs | 4 +-
ambari-web/app/templates/wizard/step9.hbs | 2 +-
ambari-web/app/utils/ajax/ajax.js | 3 +-
ambari-web/pom.xml | 19 +-
.../step7/assign_master_controller_test.js | 780 +++-
ambari-web/yarn.lock | 4170 ++++++++++++++++++
.../ui/app/components/capacityInput.js | 2 +
.../ui/app/components/bundle-config.js | 3 +-
.../resources/ui/app/components/coord-config.js | 3 +-
.../ui/app/templates/components/drafts-wf.hbs | 2 +-
dev-support/test-patch.sh | 5 +-
101 files changed, 6174 insertions(+), 941 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a33040af/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
----------------------------------------------------------------------