Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

This commit is contained in:
Brian Federle 2011-11-11 11:31:12 -08:00
commit f926eee4eb
2 changed files with 2 additions and 2 deletions

View File

@ -2868,7 +2868,7 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setNspId(result.getNspId()); response.setNspId(result.getNspId());
response.setEnabled(result.isEnabled()); response.setEnabled(result.isEnabled());
response.setObjectName("VirtualRouterElement"); response.setObjectName("virtualrouterelement");
return response; return response;
} }
} }

View File

@ -894,7 +894,7 @@
var items = []; var items = [];
items.push({id: 'Required', description: 'Required'}); items.push({id: 'Required', description: 'Required'});
items.push({id: 'Optional', description: 'Optional'}); items.push({id: 'Optional', description: 'Optional'});
items.push({id: 'Unavailable', description: 'Unavailable'}); //items.push({id: 'Unavailable', description: 'Unavailable'});
args.response.success({data: items}); args.response.success({data: items});
} }
}, },