Merge remote-tracking branch 'origin/apache-ref/branch-2.4' into 2.4.0-maint
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ffa362cd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ffa362cd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ffa362cd Branch: refs/heads/2.4.0-maint Commit: ffa362cd90248af35ef59cd968e67d7df963bae5 Parents: 989f22c f556e0e Author: Jenkins <[email protected]> Authored: Wed Aug 17 18:41:00 2016 +0000 Committer: Jenkins <[email protected]> Committed: Wed Aug 17 18:41:00 2016 +0000 ---------------------------------------------------------------------- .../main/service/reassign/step4_controller.js | 24 ++++++++++-- ambari-web/app/utils.js | 1 + .../utils/configs/move_hm_config_initializer.js | 3 +- .../utils/configs/move_hs_config_initializer.js | 3 +- .../utils/configs/move_ws_config_initializer.js | 33 +++++++++++++++++ .../service/reassign/step4_controller_test.js | 39 ++++++++++++++------ .../capacityscheduler/ConfigurationService.java | 8 ++-- .../src/main/resources/ui/app/adapters.js | 2 +- 8 files changed, 90 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
