You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/06/14 21:19:41 UTC
[10/26] ambari git commit: Merge branch 'branch-feature-AMBARI-12556'
into trunk
Merge branch 'branch-feature-AMBARI-12556' into trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/acc12fb7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/acc12fb7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/acc12fb7
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: acc12fb7232c8bcd007fe38a942209b853ce3618
Parents: 8d129d4 382da97
Author: Nate Cole <nc...@hortonworks.com>
Authored: Mon Jun 12 12:48:52 2017 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Mon Jun 12 12:48:52 2017 -0400
----------------------------------------------------------------------
.../test/python/ambari_agent/TestHostInfo.py | 107 ++++++++++
.../libraries/functions/conf_select.py | 1 -
.../libraries/functions/packages_analyzer.py | 53 ++++-
.../libraries/script/script.py | 25 ++-
.../actionmanager/ExecutionCommandWrapper.java | 65 +++---
.../ambari/server/agent/ExecutionCommand.java | 57 ++++--
.../AmbariCustomCommandExecutionHelper.java | 4 +-
.../AmbariManagementControllerImpl.java | 2 -
.../ambari/server/orm/dao/HostVersionDAO.java | 16 ++
.../server/orm/entities/HostVersionEntity.java | 5 +
.../ServiceComponentDesiredStateEntity.java | 2 +-
.../upgrades/FinalizeUpgradeAction.java | 57 +++++-
.../server/state/RepositoryVersionState.java | 31 ++-
.../apache/ambari/server/state/ServiceImpl.java | 2 +-
.../server/upgrade/UpgradeCatalog300.java | 13 +-
.../main/resources/Ambari-DDL-Derby-CREATE.sql | 2 +-
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 2 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 2 +-
.../resources/Ambari-DDL-Postgres-CREATE.sql | 2 +-
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 2 +-
.../resources/Ambari-DDL-SQLServer-CREATE.sql | 2 +-
.../STORM/0.9.1/package/scripts/params_linux.py | 2 -
.../1.0.1.3.0/package/scripts/params_linux.py | 2 -
.../custom_actions/scripts/install_packages.py | 25 ++-
.../AmbariCustomCommandExecutionHelperTest.java | 11 +-
.../upgrades/UpgradeActionTest.java | 109 ++++++++--
.../custom_actions/TestInstallPackages.py | 202 +++++++------------
.../configs/install_packages_config.json | 19 +-
.../stacks/2.0.6/HBASE/test_hbase_master.py | 11 +-
.../stacks/2.0.6/configs/hbase_with_phx.json | 12 ++
ambari-web/app/app.js | 8 +-
.../main/admin/stack_and_upgrade_controller.js | 6 +-
ambari-web/app/data/controller_route.js | 2 +-
ambari-web/app/messages.js | 4 +-
.../models/stack_version/repository_version.js | 2 +-
.../stack_upgrade/upgrade_version_box_view.js | 8 +-
.../upgrade_version_column_view.js | 2 +-
.../admin/stack_upgrade/upgrade_wizard_view.js | 2 +-
.../main/admin/stack_upgrade/versions_view.js | 2 +-
ambari-web/test/app_test.js | 10 +-
.../admin/stack_and_upgrade_controller_test.js | 18 +-
.../upgrade_version_box_view_test.js | 28 +--
.../stack_upgrade/upgrade_wizard_view_test.js | 2 +-
.../admin/stack_upgrade/version_view_test.js | 6 +-
utility/pom.xml | 21 ++
45 files changed, 650 insertions(+), 316 deletions(-)
----------------------------------------------------------------------