cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to 0c64bda
Date Thu, 19 Sep 2013 23:48:18 GMT
Updated Branches:
  refs/heads/master e59e1d148 -> 0c64bdadc


CLOUDSTACK-4713: UI > EIP/ELB Basic Zone - fix a bug that IPs that are acquired are not
showing in listView of IP Addresses page under Network menu.


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

Branch: refs/heads/master
Commit: 0c64bdadc07b8ad7bf4de732a4258cb7f763564a
Parents: e59e1d1
Author: Jessica Wang <jessicawang@apache.org>
Authored: Thu Sep 19 16:44:42 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Thu Sep 19 16:48:07 2013 -0700

----------------------------------------------------------------------
 ui/scripts/network.js | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c64bdad/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index a09e565..9d4cf38 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2057,6 +2057,8 @@
                         var data = {};
                         listViewDataProvider(args, data);
 
+                        //The following 10 lines caused CLOUDSTACK-4713 (EIP/ELB Basic Zone
- unable to see any IPs that are acquired)
+                        /*
                         if (g_supportELB == "guest") // IPs are allocated on guest network
                             $.extend(data, {
                                 forvirtualnetwork: false,
@@ -2067,6 +2069,7 @@
                                 forvirtualnetwork: true,
                                 forloadbalancing: true
                             });
+                        */
 
                         if (args.context.networks) {
                             $.extend(data, {


Mime
View raw message