You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/02 13:55:28 UTC
[1/2] git commit: updated refs/heads/master to abbdb2e
Repository: cloudstack
Updated Branches:
refs/heads/master 970f95c35 -> abbdb2ef2
CLOUDSTACK-8928: While adding VMs to LB rule, default NIC IP is always displayed rather than the IP corresponding to the NIC where LB is being created
While calling the listNics API, instead of sending the default nic id as parameter, it should send the network id as a parameter.
So, replaced that nicid parameter as networkid parameter.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/834ab53d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/834ab53d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/834ab53d
Branch: refs/heads/master
Commit: 834ab53d87fd2bef954ffb768b4923d823c631a7
Parents: 930ef8d
Author: Nitin Kumar Maharana <ni...@citrix.com>
Authored: Thu Oct 1 12:34:55 2015 +0530
Committer: Nitin Kumar Maharana <ni...@gmail.com>
Committed: Fri Oct 30 15:12:36 2015 +0530
----------------------------------------------------------------------
ui/scripts/network.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/834ab53d/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 110bc4b..787ae05 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -173,7 +173,7 @@
url: createURL('listNics'),
data: {
virtualmachineid: instance.id,
- nicId: instance.nic[0].id
+ networkid: network.id
},
success: function(json) {
var nic = json.listnicsresponse.nic[0];
[2/2] git commit: updated refs/heads/master to abbdb2e
Posted by re...@apache.org.
Merge pull request #903 from nitin-maharana/nitin1
CLOUDSTACK-8928: While adding VMs to LB rule, default NIC IP is always displayed rather than the IP corresponding to the NIC where LB is being createdWhile calling the listNics API, instead of sending the default nic id as parameter, it should send the network id as a parameter.
So, replaced that nicid parameter as networkid parameter.
* pr/903:
CLOUDSTACK-8928: While adding VMs to LB rule, default NIC IP is always displayed rather than the IP corresponding to the NIC where LB is being created
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/abbdb2ef
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/abbdb2ef
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/abbdb2ef
Branch: refs/heads/master
Commit: abbdb2ef2f2cc91a0a5b37f2424d880cb9b36027
Parents: 970f95c 834ab53
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Nov 2 13:54:52 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Mon Nov 2 13:54:53 2015 +0100
----------------------------------------------------------------------
ui/scripts/network.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------