You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2014/12/16 03:04:45 UTC
ambari git commit: Revert "AMBARI-8719 Repo distribution progress:
task "Install Packages Actionexecute" should just say "Install Packages".
(ababiichuk)" Unit test failure introduced. This reverts commit
2ccfa617a92a77582835d0cedffdb2853f25b41f.
Repository: ambari
Updated Branches:
refs/heads/trunk c78d584e3 -> 7691aa4a5
Revert "AMBARI-8719 Repo distribution progress: task "Install Packages Actionexecute" should just say "Install Packages". (ababiichuk)"
Unit test failure introduced.
This reverts commit 2ccfa617a92a77582835d0cedffdb2853f25b41f.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7691aa4a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7691aa4a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7691aa4a
Branch: refs/heads/trunk
Commit: 7691aa4a5b74c5fd744e1d5033e384572034007d
Parents: c78d584
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Mon Dec 15 18:04:27 2014 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Mon Dec 15 18:04:27 2014 -0800
----------------------------------------------------------------------
ambari-web/app/messages.js | 1 -
ambari-web/app/utils/helper.js | 3 ---
ambari-web/test/utils/helper_test.js | 4 ----
3 files changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7691aa4a/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 478b180..83eacf6 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -221,7 +221,6 @@ Em.I18n.translations = {
'common.hostLog.popup.outputLog.value': 'output-{0}.txt',
'common.hostLog.popup.errorLog.value': 'errors-{0}.txt',
'common.maintenance.task': ' Toggle Maintenance Mode',
- 'common.installRepo.task': ' Install Packages',
'common.used': 'used',
'common.free': 'free',
'common.type.string': 'string',
http://git-wip-us.apache.org/repos/asf/ambari/blob/7691aa4a/ambari-web/app/utils/helper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js
index 68a1047..7d182bf 100644
--- a/ambari-web/app/utils/helper.js
+++ b/ambari-web/app/utils/helper.js
@@ -485,9 +485,6 @@ App.format = {
if (result === ' Nagios Update Ignore Actionexecute') {
result = Em.I18n.t('common.maintenance.task');
}
- if (result === ' Install Packages Actionexecute') {
- result = Em.I18n.t('common.installRepo.task');
- }
if (result === ' Rebalancehdfs NameNode') {
result = Em.I18n.t('services.service.actions.run.rebalanceHdfsNodes.title');
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/7691aa4a/ambari-web/test/utils/helper_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/helper_test.js b/ambari-web/test/utils/helper_test.js
index 8e7e501..9274ae0 100644
--- a/ambari-web/test/utils/helper_test.js
+++ b/ambari-web/test/utils/helper_test.js
@@ -179,7 +179,6 @@ describe('utils/helper', function() {
var ignored = "DECOMMISSION, NAMENODE";
var removeString = "SERVICE/HDFS STOP";
var nagiosState = "nagios_update_ignore ACTIONEXECUTE";
- var installPepo = ' Install Packages Actionexecute';
it('should convert command to readable info', function() {
expect(App.format.commandDetail(command)).to.eql(' Ganglia Monitor Stop');
});
@@ -192,9 +191,6 @@ describe('utils/helper', function() {
it('should return maintenance message', function() {
expect(App.format.commandDetail(nagiosState)).to.eql(' Toggle Maintenance Mode');
});
- it('should return install repo message', function() {
- expect(App.format.commandDetail(installPepo)).to.eql(Em.I18n.t('common.installRepo.task'));
- });
});
describe('#taskStatus()', function(){
var testable = [