Updated Branches: refs/heads/master 7934b1631 -> 2f2918594
Dedicate POD -UI and API integration code Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aab0bb4d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aab0bb4d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aab0bb4d Branch: refs/heads/master Commit: aab0bb4d31a7ee602ea7d2b30f58ffb5a569f534 Parents: 2564345 Author: Pranav Saxena <pranav.sax...@citrix.com> Authored: Tue May 14 16:46:02 2013 +0530 Committer: Pranav Saxena <pranav.sax...@citrix.com> Committed: Thu May 30 21:57:09 2013 +0530 ---------------------------------------------------------------------- ui/scripts/system.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aab0bb4d/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index fc0c70f..1b1f61d 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -8600,7 +8600,7 @@ dataType:"json", success:function(json){ var dedicatedObj = json.dedicatepodresponse.host; - args.response.success({data:item}); + args.response.success({ data: $.extend(item, dedicatedObj)}); },
