cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/master to 7144e9b
Date Fri, 27 Mar 2015 03:59:50 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 042b99f6b -> 7144e9b35


CLOUDSTACK-8231: use hardcoded list of LB algorithms as backup

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 6f2facfa3900f064e19cee34add2895862ef0556)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


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

Branch: refs/heads/master
Commit: 7144e9b35d4efabe9956dda396a799fcfba26be6
Parents: 042b99f
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Fri Mar 27 09:28:16 2015 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Fri Mar 27 09:29:36 2015 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7144e9b3/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 46475bb..f62502f 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1684,7 +1684,22 @@
                                             'algorithm': {
                                                 label: 'label.algorithm',
                                                 select: function(args) {
-                                                    var data = getLBAlgorithms(args.context.networks[0]);
+                                                    var data = [{
+                                                            id: 'roundrobin',
+                                                            name: 'roundrobin',
+                                                            description: _l('label.lb.algorithm.roundrobin')
+                                                        }, {
+                                                            id: 'leastconn',
+                                                            name: 'leastconn',
+                                                            description: _l('label.lb.algorithm.leastconn')
+                                                        }, {
+                                                            id: 'source',
+                                                            name: 'source',
+                                                            description: _l('label.lb.algorithm.source')
+                                                        }];
+                                                    if (typeof args.context != 'undefined')
{
+                                                        data = getLBAlgorithms(args.context.networks[0]);
+                                                    }
                                                     args.response.success({
                                                         data: data
                                                     });


Mime
View raw message