cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pran...@apache.org
Subject git commit: updated refs/heads/UI-explicitDedication to 00ed349
Date Tue, 14 May 2013 11:29:12 GMT
Updated Branches:
  refs/heads/UI-explicitDedication da1791fc3 -> 00ed34971


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/00ed3497
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/00ed3497
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/00ed3497

Branch: refs/heads/UI-explicitDedication
Commit: 00ed34971b19f654e4d72032e20f50966e67fb11
Parents: da1791f
Author: Pranav Saxena <pranav.saxena@citrix.com>
Authored: Tue May 14 16:46:02 2013 +0530
Committer: Pranav Saxena <pranav.saxena@citrix.com>
Committed: Tue May 14 16:46:02 2013 +0530

----------------------------------------------------------------------
 ui/scripts/system.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/00ed3497/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index b67fdc7..f2fc8a4 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -8065,7 +8065,7 @@
                          dataType:"json",
                          success:function(json){
                              var dedicatedObj = json.dedicatepodresponse.host;
-                             args.response.success({data:item});
+                             args.response.success({ data: $.extend(item, dedicatedObj)});
 
                          },
 


Mime
View raw message