Merge branch 'trunk' into branch-feature-AMBARI-18634
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6088e4f1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6088e4f1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6088e4f1 Branch: refs/heads/trunk Commit: 6088e4f1c96c27ada12e1645db828a234efbe876 Parents: ba526d9 91b7d22 Author: Nate Cole <[email protected]> Authored: Thu Oct 27 11:20:13 2016 -0400 Committer: Nate Cole <[email protected]> Committed: Thu Oct 27 11:20:13 2016 -0400 ---------------------------------------------------------------------- .../python/ambari_agent/HeartbeatHandlers.py | 13 +- .../python/ambari_agent/RemoteDebugUtils.py | 21 ++- .../ambari_agent/StatusCommandsExecutor.py | 12 +- .../libraries/functions/constants.py | 1 + .../src/main/python/core/host_info.py | 12 +- .../internal/UserPrivilegeResourceProvider.java | 116 ++++++++++++- .../ambari/server/events/AmbariEvent.java | 5 + .../server/events/StackUpgradeFinishEvent.java | 41 +++++ .../upgrade/StackUpgradeFinishListener.java | 83 ++++++++++ .../listeners/upgrade/StackVersionListener.java | 53 ++++-- .../publishers/VersionEventPublisher.java | 9 +- .../upgrades/FinalizeUpgradeAction.java | 8 + .../ambari/server/state/ServiceComponent.java | 6 + .../server/state/ServiceComponentImpl.java | 41 ++--- .../upgrade/ConfigUpgradeChangeDefinition.java | 75 +-------- .../state/stack/upgrade/ConfigureTask.java | 49 +----- .../ATLAS/0.1.0.2.3/role_command_order.json | 7 + .../ATLAS/0.7.0.2.5/role_command_order.json | 7 + .../HAWQ/2.0.0/role_command_order.json | 11 ++ .../2.1.0.2.0/package/scripts/zkfc_slave.py | 20 +++ .../PXF/3.0.0/configuration/pxf-profiles.xml | 14 ++ .../PXF/3.0.0/role_command_order.json | 7 + .../0.6.0.2.5/package/scripts/master.py | 2 + .../HDP/2.0.6/properties/stack_features.json | 5 + .../stacks/HDP/2.2/upgrades/config-upgrade.xml | 110 +++++-------- .../stacks/HDP/2.3/role_command_order.json | 10 -- .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 28 ++-- .../stacks/HDP/2.4/upgrades/config-upgrade.xml | 29 ++-- .../stacks/HDP/2.5/role_command_order.json | 3 +- .../stacks/HDP/2.5/services/HDFS/metainfo.xml | 6 + .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 4 +- .../src/main/resources/upgrade-config.xsd | 163 +++++++++++++++++++ .../UserPrivilegeResourceProviderTest.java | 2 + .../upgrade/StackUpgradeFinishListenerTest.java | 108 ++++++++++++ .../upgrade/StackVersionListenerTest.java | 47 +++++- .../ambari/server/state/UpgradeHelperTest.java | 50 +++--- .../state/stack/ConfigUpgradeValidityTest.java | 68 +++++++- .../stacks/2.5/ZEPPELIN/test_zeppelin_master.py | 3 + .../HDP/2.1.1/upgrades/config-upgrade.xml | 52 ++---- .../stacks/HDP/2.1.1/upgrades/upgrade_test.xml | 2 +- .../HDP/2.2.0/upgrades/config-upgrade.xml | 19 +-- .../HDP/2.2.0/upgrades/config-upgrade.xml | 19 +-- .../controllers/main/host/combo_search_box.js | 2 +- .../app/routes/manage_journalnode_routes.js | 3 +- ambari-web/app/styles/application.less | 5 + .../highAvailability/journalNode/wizard.hbs | 34 ++-- .../app/templates/main/service/menu_item.hbs | 4 +- .../views/common/configs/config_history_flow.js | 2 +- 48 files changed, 965 insertions(+), 426 deletions(-) ----------------------------------------------------------------------
