You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/04/11 20:19:42 UTC
svn commit: r1467034 - in /incubator/ambari/trunk: CHANGES.txt
ambari-web/app/utils/ajax.js ambari-web/app/utils/config.js
Author: yusaku
Date: Thu Apr 11 18:19:42 2013
New Revision: 1467034
URL: http://svn.apache.org/r1467034
Log:
AMBARI-1880. stacks2 API uses type to refer to config tags and no longer exposes "filename" as a property. (srimanth via yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/utils/ajax.js
incubator/ambari/trunk/ambari-web/app/utils/config.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1467034&r1=1467033&r2=1467034&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Apr 11 18:19:42 2013
@@ -690,6 +690,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1880. stacks2 API uses "type" to refer to config tags and no longer
+ exposes "filename" as a property. (srimanth via yusaku)
+
AMBARI-1873. HUE pid and log dir labels are flip flopped. (yusaku)
AMBARI-1878. Host overrides functionality broken in wizard Step7 controller.
Modified: incubator/ambari/trunk/ambari-web/app/utils/ajax.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/ajax.js?rev=1467034&r1=1467033&r2=1467034&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/ajax.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/ajax.js Thu Apr 11 18:19:42 2013
@@ -208,7 +208,7 @@ var urls = {
}
},
'config.advanced.global': {
- 'real': '{stack2VersionUrl}/stackServices?fields=configurations/StackConfigurations/filename',
+ 'real': '{stack2VersionUrl}/stackServices?fields=configurations/StackConfigurations/type',
'mock': '/data/wizard/stack/hdp/version130/global.json',
'format': function(data){
return {
Modified: incubator/ambari/trunk/ambari-web/app/utils/config.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/config.js?rev=1467034&r1=1467033&r2=1467034&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/config.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/config.js Thu Apr 11 18:19:42 2013
@@ -515,7 +515,7 @@ App.config = Em.Object.create({
if(data.items!=null){
data.items.forEach(function(service){
service.configurations.forEach(function(config){
- if("global.xml" === config.StackConfigurations.filename){
+ if("global.xml" === config.StackConfigurations.type){
if(!(config.StackConfigurations.property_name in globalPropertyToServicesMap)){
globalPropertyToServicesMap[config.StackConfigurations.property_name] = [];
}