Updated Branches: refs/heads/trunk 98adf5947 -> e136095b8
AMBARI-3587: Reassign Master (non-secure): JobTracker reassignment does not need manual step.(jaimin) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/e136095b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/e136095b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/e136095b Branch: refs/heads/trunk Commit: e136095b858a3a0ab0fc84e51ce10c0eb524d438 Parents: 98adf59 Author: Jaimin Jetly <[email protected]> Authored: Thu Oct 24 16:20:14 2013 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Thu Oct 24 16:20:14 2013 -0700 ---------------------------------------------------------------------- .../app/controllers/main/service/reassign/step4_controller.js | 1 - ambari-web/app/controllers/main/service/reassign_controller.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/e136095b/ambari-web/app/controllers/main/service/reassign/step4_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/reassign/step4_controller.js b/ambari-web/app/controllers/main/service/reassign/step4_controller.js index 4efcfd2..4d8df1d 100644 --- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js +++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js @@ -242,7 +242,6 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro } break; case 'JOBTRACKER': - componentDir = configs['mapred-site']['mapred.local.dir']; configs['mapred-site']['mapreduce.history.server.http.address'] = targetHostName + ':51111'; configs['mapred-site']['mapred.job.tracker.http.address'] = targetHostName + ':50030'; configs['mapred-site']['mapred.job.tracker'] = targetHostName + ':50300'; http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/e136095b/ambari-web/app/controllers/main/service/reassign_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/reassign_controller.js b/ambari-web/app/controllers/main/service/reassign_controller.js index 736e3b9..a0efb8b 100644 --- a/ambari-web/app/controllers/main/service/reassign_controller.js +++ b/ambari-web/app/controllers/main/service/reassign_controller.js @@ -57,7 +57,7 @@ App.ReassignMasterController = App.WizardController.extend({ hasManualSteps: false }), - componentsWithManualSteps: ['NAMENODE', 'SECONDARY_NAMENODE', 'JOBTRACKER'], + componentsWithManualSteps: ['NAMENODE', 'SECONDARY_NAMENODE'], addManualSteps: function () { this.set('content.hasManualSteps', this.get('componentsWithManualSteps').contains(this.get('content.reassign.component_name')));
