You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/03/18 23:07:10 UTC
[1/2] ambari git commit: AMBARI-10122. BG operations popup: Label for
refreshqueues has no spaces in it (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 68468feee -> d4607e5f1
AMBARI-10122. BG operations popup: Label for refreshqueues has no spaces in it (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6edfe30e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6edfe30e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6edfe30e
Branch: refs/heads/trunk
Commit: 6edfe30eca1091ad3de0d7b24e7bc187e11cfd29
Parents: 68468fe
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed Mar 18 18:19:49 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Mar 19 00:07:04 2015 +0200
----------------------------------------------------------------------
ambari-web/app/messages.js | 1 +
ambari-web/app/utils/helper.js | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6edfe30e/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 28c2da5..1730b62 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1430,6 +1430,7 @@ Em.I18n.translations = {
'services.service.actions.run.rebalanceHdfsNodes.promptError':'Value should be number between 1 and 100',
'services.service.actions.run.rebalanceHdfsNodes.context':'Rebalance HDFS',
'services.service.actions.run.rebalanceHdfsNodes.error':'Error during remote command: ',
+ 'services.service.actions.run.yarnRefreshQueues.title':'Refresh Queues ResourceManager',
'services.service.actions.run.yarnRefreshQueues.menu':'Refresh YARN Capacity Scheduler',
'services.service.actions.run.yarnRefreshQueues.context':'Refresh YARN Capacity Scheduler',
'services.service.actions.run.yarnRefreshQueues.error':'Error during remote command: ',
http://git-wip-us.apache.org/repos/asf/ambari/blob/6edfe30e/ambari-web/app/utils/helper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js
index 2b6eae5..c7358c4 100644
--- a/ambari-web/app/utils/helper.js
+++ b/ambari-web/app/utils/helper.js
@@ -497,6 +497,9 @@ App.format = {
if (result === " Stopdemoldap Knox Gateway") {
result = Em.I18n.t('services.service.actions.run.stopLdapKnox.title');
}
+ if (result === ' Refreshqueues ResourceManager') {
+ result = Em.I18n.t('services.service.actions.run.yarnRefreshQueues.title');
+ }
return result;
},
[2/2] ambari git commit: AMBARI-8620. weird directory suggestions
upon Docker containers (alexantonenko)
Posted by al...@apache.org.
AMBARI-8620. weird directory suggestions upon Docker containers (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d4607e5f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d4607e5f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d4607e5f
Branch: refs/heads/trunk
Commit: d4607e5f14a5c803f20da4f6dbebb66a06471883
Parents: 6edfe30
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Mar 19 00:05:49 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Mar 19 00:07:05 2015 +0200
----------------------------------------------------------------------
ambari-web/app/models/service_config.js | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d4607e5f/ambari-web/app/models/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index ce29edf..cb8e5a9 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -781,6 +781,7 @@ App.ServiceConfigProperty = Em.Object.extend({
mountPointsPerHost = mountPointsPerHost.filter(function (mPoint) {
return !(['/', '/home'].contains(mPoint.mountpoint)
+ || ['/etc/resolv.conf', '/etc/hostname', '/etc/hosts'].contains(mPoint.mountpoint) // docker specific mount points
|| mPoint.mountpoint && (mPoint.mountpoint.startsWith('/boot') || mPoint.mountpoint.startsWith('/mnt'))
|| ['devtmpfs', 'tmpfs', 'vboxsf', 'CDFS'].contains(mPoint.type)
|| mPoint.available == 0);