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/17 13:32:35 UTC
[11/11] ambari git commit: Merge branch 'branch-2.6' into
branch-feature-AMBARI-22457
Merge branch 'branch-2.6' into branch-feature-AMBARI-22457
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2f02bc69
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2f02bc69
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2f02bc69
Branch: refs/heads/branch-feature-AMBARI-22457
Commit: 2f02bc69376aa03cd56ca8789cd1d02e902604bc
Parents: 3df5ae7 c09c69b
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Fri Nov 17 08:30:31 2017 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Fri Nov 17 08:30:31 2017 -0500
----------------------------------------------------------------------
.../libraries/functions/copy_tarball.py | 102 +++++-
.../libraries/functions/tar_archive.py | 6 +-
.../internal/UpgradeResourceProvider.java | 36 ++
.../upgrades/CreateAndConfigureAction.java | 164 +++++++++
.../ambari/server/state/stack/UpgradePack.java | 3 +
.../state/stack/upgrade/ClusterGrouping.java | 2 +
.../stack/upgrade/CreateAndConfigureTask.java | 57 +++
.../ambari/server/state/stack/upgrade/Task.java | 6 +-
.../HIVE/0.12.0.2.0/configuration/hive-site.xml | 2 +-
.../4.0/properties/stack_packages.json | 12 -
.../stacks/HDP/2.0.6/role_command_order.json | 1 +
.../services/HIVE/configuration/hive-site.xml | 2 +-
.../services/HIVE/configuration/hive-site.xml | 2 +-
.../stacks/HDP/2.5/upgrades/config-upgrade.xml | 23 ++
.../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 23 +-
.../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 45 ++-
.../configuration/spark2-log4j-properties.xml | 56 +++
.../src/main/resources/upgrade-pack.xsd | 9 +-
.../upgrades/CreateAndConfigureActionTest.java | 357 +++++++++++++++++++
.../stacks/2.1/FALCON/test_falcon_server.py | 6 +-
ambari-web/app/views/common/controls_view.js | 8 +-
.../test/views/common/controls_view_test.js | 2 +-
22 files changed, 866 insertions(+), 58 deletions(-)
----------------------------------------------------------------------