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 2016/04/07 17:05:29 UTC
[1/2] ambari git commit: AMBARI-15763. Delete service: UX edits v2
(alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk b1d43fbe0 -> d17ea8be3
AMBARI-15763. Delete service: UX edits v2 (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d17ea8be
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d17ea8be
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d17ea8be
Branch: refs/heads/trunk
Commit: d17ea8be32fefe83d23de94ddd18906a0fa426c3
Parents: 6e349d9
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Apr 7 18:05:23 2016 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Apr 7 18:05:24 2016 +0300
----------------------------------------------------------------------
ambari-web/app/messages.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d17ea8be/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index b2e3f1c..2d6ec67 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1776,7 +1776,7 @@ Em.I18n.translations = {
'services.service.delete.popup.mustBeStopped.dependent': ' Along with dependent service <b>{0}</b>.',
'services.service.delete.popup.warning': 'The <b>{0} service will be removed from Ambari and all configurations' +
' and configuration history will be lost.</b>',
- 'services.service.delete.popup.warning.dependent': '<b>Note! {0} will be deleted too.</b>',
+ 'services.service.delete.popup.warning.dependent': '<b> Note: The dependent {0} service will be removed too.</b>',
'services.service.confirmDelete.popup.header': 'Confirm Delete',
'services.service.confirmDelete.popup.body': 'You must confirm delete of <b>{0}</b> by typing "{1}"' +
' in the confirmation box. <b>This operation is not reversible and all configuration history will be lost.</b>',
[2/2] ambari git commit: AMBARI-15740. Unable to add multiple fencing
methods for dfs.ha.fencing.methods via Ambari UI (alexantonenko)
Posted by al...@apache.org.
AMBARI-15740. Unable to add multiple fencing methods for dfs.ha.fencing.methods via Ambari UI (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6e349d9a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6e349d9a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6e349d9a
Branch: refs/heads/trunk
Commit: 6e349d9adca9f2d73fc9790f875e6d653757247c
Parents: b1d43fb
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Apr 7 17:41:55 2016 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Apr 7 18:05:24 2016 +0300
----------------------------------------------------------------------
ambari-web/app/data/HDP2/ha_properties.js | 1 +
ambari-web/app/data/HDP2/ui_properties.js | 9 +++++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6e349d9a/ambari-web/app/data/HDP2/ha_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/ha_properties.js b/ambari-web/app/data/HDP2/ha_properties.js
index 0bd905f..18c5a68 100644
--- a/ambari-web/app/data/HDP2/ha_properties.js
+++ b/ambari-web/app/data/HDP2/ha_properties.js
@@ -192,6 +192,7 @@ module.exports =
"description": "A list of scripts or Java classes which will be used to fence the Active NameNode during a failover.",
"isReconfigurable": false,
"recommendedValue": "shell(/bin/true)",
+ "displayType": "multiLine",
"value": "shell(/bin/true)",
"category": "HDFS",
"filename": "hdfs-site",
http://git-wip-us.apache.org/repos/asf/ambari/blob/6e349d9a/ambari-web/app/data/HDP2/ui_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/ui_properties.js b/ambari-web/app/data/HDP2/ui_properties.js
index ab18bf9..8d731d9 100644
--- a/ambari-web/app/data/HDP2/ui_properties.js
+++ b/ambari-web/app/data/HDP2/ui_properties.js
@@ -36,5 +36,14 @@ module.exports = [
"filename": "krb5-conf.xml",
"category": "Kadmin",
"index": 2
+ },
+ {
+ "name": "dfs.ha.fencing.methods",
+ "displayName": "dfs.ha.fencing.methods",
+ "serviceName": "HDFS",
+ "filename": "hdfs-site.xml",
+ "category": "Advanced hdfs-site",
+ "displayType": "multiLine",
+ "index": 1
}
];