You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/06/03 12:14:29 UTC
[1/2] git commit: updated refs/heads/master to cefd099
Updated Branches:
refs/heads/master 68b8da0df -> cefd099c9
changing vpc_id to vpcid
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/35f2dc6e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/35f2dc6e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/35f2dc6e
Branch: refs/heads/master
Commit: 35f2dc6e520299b1c7dd51f46a1056d2eb539c8c
Parents: 7b0da06
Author: Pranav Saxena <pr...@citrix.com>
Authored: Mon Jun 3 15:42:55 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Mon Jun 3 15:42:55 2013 +0530
----------------------------------------------------------------------
ui/scripts/vpc.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/35f2dc6e/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 033ac7f..b57a562 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -657,7 +657,7 @@
},
dataProvider: function(args) {
$.ajax({
- url:createURL('listNetworkACLLists&vpc_id=' + args.context.vpc[0].id),
+ url:createURL('listNetworkACLLists&vpcid=' + args.context.vpc[0].id),
success:function(json){
var items = json.listnetworkacllistsresponse.networkacllist;
@@ -3224,7 +3224,7 @@
// Get network ACL lists
$.ajax({
url: createURL('listNetworkACLLists'),
- data: { 'vpc_id': args.context.vpc[0].id },
+ data: { 'vpcid': args.context.vpc[0].id },
async: false,
success: function(json) {
networkACLLists = json.listnetworkacllistsresponse;
[2/2] git commit: updated refs/heads/master to cefd099
Posted by pr...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cefd099c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cefd099c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cefd099c
Branch: refs/heads/master
Commit: cefd099c9db0c3ede232664cc3d5db525164f6d6
Parents: 35f2dc6 68b8da0
Author: Pranav Saxena <pr...@citrix.com>
Authored: Mon Jun 3 15:44:00 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Mon Jun 3 15:44:00 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/server/StatsCollector.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------