You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2014/01/31 00:07:18 UTC
[1/2] git commit: AMBARI-4476. Bulk operation- Recom/decom
NodeManagers says 'DataNodes'.
Updated Branches:
refs/heads/trunk c4a778da0 -> 2585f9b51
AMBARI-4476. Bulk operation- Recom/decom NodeManagers says 'DataNodes'.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/af7a9d89
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/af7a9d89
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/af7a9d89
Branch: refs/heads/trunk
Commit: af7a9d89238330a0440e83e2b66f0c34f91df4dd
Parents: c4a778d
Author: Xi Wang <xi...@apache.org>
Authored: Thu Jan 30 11:23:48 2014 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Thu Jan 30 14:49:35 2014 -0800
----------------------------------------------------------------------
ambari-web/app/controllers/main/host.js | 4 +++-
ambari-web/app/messages.js | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/af7a9d89/ambari-web/app/controllers/main/host.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host.js b/ambari-web/app/controllers/main/host.js
index 56ec00f..067071a 100644
--- a/ambari-web/app/controllers/main/host.js
+++ b/ambari-web/app/controllers/main/host.js
@@ -324,6 +324,8 @@ App.MainHostController = Em.ArrayController.extend({
var parameters = {
"slave_type": operationData.realComponentName
};
+ var contextString = turn_off? 'hosts.host.' + operationData.realComponentName.toLowerCase() + '.recommission':
+ 'hosts.host.' + operationData.realComponentName.toLowerCase() + '.decommission';
if (turn_off) {
parameters['included_hosts'] = hostsWithComponentInProperState.join(',')
}
@@ -334,7 +336,7 @@ App.MainHostController = Em.ArrayController.extend({
name: 'bulk_request.decommission',
sender: this,
data: {
- context: turn_off ? Em.I18n.t('hosts.host.datanode.recommission') : Em.I18n.t('hosts.host.datanode.decommission'),
+ context: Em.I18n.t(contextString),
serviceName: service.get('serviceName'),
componentName: operationData.componentName,
parameters: parameters
http://git-wip-us.apache.org/repos/asf/ambari/blob/af7a9d89/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index c2c052b..c0f3a92 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1421,6 +1421,7 @@ Em.I18n.translations = {
'hosts.host.regionserver.decommission.batch2':'Decommission RegionServer - Stop RegionServer',
'hosts.host.regionserver.decommission.batch3':'Decommission RegionServer - Turn drain mode off',
'hosts.host.hbase_regionserver.recommission':'Recommission HBase RegionServer',
+ 'hosts.host.hbase_regionserver.decommission':'Decommission HBase RegionServer',
'hosts.host.decommissioned':'Decommissioned',
'hosts.host.decommissioning':'Decommissioning...',
[2/2] git commit: AMBARI-4478. Background Op Popup is broken for
Install Wizard's Deploy step.
Posted by xi...@apache.org.
AMBARI-4478. Background Op Popup is broken for Install Wizard's Deploy step.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2585f9b5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2585f9b5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2585f9b5
Branch: refs/heads/trunk
Commit: 2585f9b51d7b39798721697a6a46b6ecdb30ce83
Parents: af7a9d8
Author: Xi Wang <xi...@apache.org>
Authored: Thu Jan 30 14:05:10 2014 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Thu Jan 30 14:50:12 2014 -0800
----------------------------------------------------------------------
ambari-web/app/styles/application.less | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2585f9b5/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 2f4c999..0d7997c 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -1529,6 +1529,24 @@ width:100%;
//margin-top: -28px;
}
}
+
+ #host-log {
+ .log-list-wrap {
+ padding: 10px 10px 10px 20px;
+ border-top: 1px solid #CCC;
+ border-bottom: 1px solid #CCC;
+
+ .show-details {
+ float: right;
+ cursor: pointer;
+ font-size: 16px;
+
+ i {
+ color: #333;
+ }
+ }
+ }
+ }
}
.task-detail-info {