You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2014/02/28 15:17:52 UTC
git commit: AMBARI-4883 Editing log4j.properties causes services to
fail. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 0a5c3ff27 -> 6627144d4
AMBARI-4883 Editing log4j.properties causes services to fail. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6627144d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6627144d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6627144d
Branch: refs/heads/trunk
Commit: 6627144d4cb1d8a66356c86f1b008706276609bd
Parents: 0a5c3ff
Author: atkach <at...@hortonworks.com>
Authored: Fri Feb 28 16:10:25 2014 +0200
Committer: atkach <at...@hortonworks.com>
Committed: Fri Feb 28 16:17:50 2014 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/info/configs.js | 3 +++
ambari-web/app/utils/config.js | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6627144d/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index 35139a2..bd753a0 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -1446,6 +1446,9 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
case 'storm.zookeeper.servers':
return JSON.stringify(value).replace(/"/g, "'");
break;
+ case 'content':
+ return value;
+ break;
default:
return App.config.escapeXMLCharacters(value);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6627144d/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 4829bf1..ea9ccd6 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -60,7 +60,7 @@ App.config = Em.Object.create({
*/
escapeXMLCharacters: function(value) {
var self = this;
- // To prevent double/triple replacing '>' to '>gt;' to '>gt;gt', we need
+ // To prevent double/triple replacing '>' to '&gt;' to '&amp;gt;', we need
// to first unescape all XML chars, and then escape them again.
var newValue = String(value).replace(/(&|<|>|"|')/g, function (s) {
return self.xmlUnEscapeMap[s];