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/c7457a82 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c7457a82 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c7457a82 Branch: refs/heads/branch-feature-AMBARI-22457 Commit: c7457a820046392dfaf5ca06202143d06c4f143b Parents: 58c7f78 0615fa0 Author: Andrew Onishuk <[email protected]> Authored: Wed Nov 22 10:44:42 2017 +0200 Committer: Andrew Onishuk <[email protected]> Committed: Wed Nov 22 10:44:42 2017 +0200 ---------------------------------------------------------------------- .../libraries/functions/copy_tarball.py | 60 ++++---- ambari-metrics/ambari-metrics-assembly/pom.xml | 1 - ambari-server/pom.xml | 12 ++ .../ambari/server/actionmanager/Stage.java | 3 +- .../internal/UpgradeResourceProvider.java | 2 + .../serveraction/ServerActionExecutor.java | 147 +++++++++++++++++-- .../ambari/server/stack/ServiceDirectory.java | 29 ++++ .../ambari/server/stack/ServiceModule.java | 8 + .../apache/ambari/server/state/ServiceInfo.java | 14 ++ .../stack/upgrade/ServerSideActionTask.java | 15 ++ .../state/stack/upgrade/TaskParameter.java | 41 ++++++ .../stacks/HDP/2.6/services/stack_advisor.py | 11 +- .../src/main/resources/upgrade-pack.xsd | 9 ++ .../ambari/server/stack/ServiceModuleTest.java | 30 ++++ .../server/stack/StackManagerExtensionTest.java | 6 + .../main/service/reassign/step3_controller.js | 3 + .../main/service/reassign/step4_controller.js | 12 +- .../service/reassign/step4_controller_test.js | 9 +- 18 files changed, 355 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c7457a82/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py ----------------------------------------------------------------------
