Repository: ambari Updated Branches: refs/heads/trunk 29c42549b -> c54b16f47
AMBARI-8101. Datanode directories add \n between directory names when creating hdfs-site. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c54b16f4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c54b16f4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c54b16f4 Branch: refs/heads/trunk Commit: c54b16f4795eed7263b9948a47011d0857ad0640 Parents: 29c4254 Author: Jaimin Jetly <jai...@hortonworks.com> Authored: Sat Nov 1 15:57:55 2014 -0700 Committer: Jaimin Jetly <jai...@hortonworks.com> Committed: Sat Nov 1 16:18:35 2014 -0700 ---------------------------------------------------------------------- ambari-web/app/utils/config.js | 1 + ambari-web/test/utils/config_test.js | 7 +++++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c54b16f4/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index 778c950..7b43459 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -1257,6 +1257,7 @@ App.config = Em.Object.create({ switch (displayType) { case 'directories': case 'directory': + case 'datanodedirs': rez = value.trim().split(/\s+/g).join(','); break; case 'host': http://git-wip-us.apache.org/repos/asf/ambari/blob/c54b16f4/ambari-web/test/utils/config_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/utils/config_test.js b/ambari-web/test/utils/config_test.js index b04a404..4c68e8b 100644 --- a/ambari-web/test/utils/config_test.js +++ b/ambari-web/test/utils/config_test.js @@ -328,6 +328,13 @@ describe('App.config', function () { }, { config: { + displayType: 'datanodedirs', + value: ' [DISK]/a [SSD]/b ' + }, + e: '[DISK]/a,[SSD]/b' + }, + { + config: { displayType: 'host', value: ' localhost ' },
