cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pran...@apache.org
Subject [31/50] git commit: updated refs/heads/master to b03e419
Date Tue, 28 May 2013 07:59:16 GMT
CLOUDSTACK-747: internal LB in VPC - fix a bug that Source IP Address column was not filled
after Add Internal LB action was complete.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a0e75c12
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a0e75c12
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a0e75c12

Branch: refs/heads/master
Commit: a0e75c12cd62541f750e9ff556d7b570483dbf72
Parents: b11c44f
Author: Jessica Wang <jessicawang@apache.org>
Authored: Wed May 22 11:18:26 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Wed May 22 11:21:20 2013 -0700

----------------------------------------------------------------------
 ui/scripts/vpc.js |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0e75c12/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index be7fdd7..f334735 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -410,8 +410,8 @@
                         args.response.success(
                           {_custom:
                            {jobId: jid,
-                            getUpdatedItem: function(json) {                          
-                              return json.queryasyncjobresultresponse.jobresult.loadbalancerrule;
+                            getUpdatedItem: function(json) {    
+                              return json.queryasyncjobresultresponse.jobresult.loadbalancer;
                             }
                            }
                           }
@@ -422,14 +422,7 @@
                     args.response.success();
                   },
                   notification: {
-                    poll: function(args) {
-                      args.complete({
-                        data: {
-                          ipaddress: '10.0.3.2',
-                          type: 'Internal'
-                        }
-                      });
-                    }
+                    poll: pollAsyncJobResult
                   }
                 }
               },


Mime
View raw message