incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject git commit: VPC: fixed listNetworkACLs by networkId
Date Fri, 06 Jul 2012 23:43:06 GMT
Updated Branches:
  refs/heads/vpc c9eb0c59b -> 5be0a3eeb


VPC: fixed listNetworkACLs by networkId

Conflicts:

	api/src/com/cloud/api/commands/ListNetworkACLsCmd.java


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

Branch: refs/heads/vpc
Commit: 5be0a3eeb1a32e29859f722861fbda50febe6b5f
Parents: c9eb0c5
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Fri Jul 6 16:33:19 2012 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Fri Jul 6 16:43:39 2012 -0700

----------------------------------------------------------------------
 .../com/cloud/api/commands/ListNetworkACLsCmd.java |    3 ---
 .../cloud/network/vpc/NetworkACLManagerImpl.java   |    2 +-
 2 files changed, 1 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5be0a3ee/api/src/com/cloud/api/commands/ListNetworkACLsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/api/commands/ListNetworkACLsCmd.java b/api/src/com/cloud/api/commands/ListNetworkACLsCmd.java
index e7d3790..8ffe4db 100644
--- a/api/src/com/cloud/api/commands/ListNetworkACLsCmd.java
+++ b/api/src/com/cloud/api/commands/ListNetworkACLsCmd.java
@@ -12,9 +12,6 @@
 // Automatically generated by addcopyright.py at 04/03/2012
 package com.cloud.api.commands;
 
-/**
- * @author Alena Prokharchyk
- */
 
 import java.util.ArrayList;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5be0a3ee/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
index faef711..66ea1d5 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
@@ -334,7 +334,7 @@ public class NetworkACLManagerImpl implements Manager,NetworkACLManager{
         _accountMgr.buildACLSearchBuilder(sb, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
 
         sb.and("id", sb.entity().getId(), Op.EQ);
-        sb.and("network", sb.entity().getNetworkId(), Op.EQ);
+        sb.and("networkId", sb.entity().getNetworkId(), Op.EQ);
         sb.and("purpose", sb.entity().getPurpose(), Op.EQ);
         sb.and("trafficType", sb.entity().getTrafficType(), Op.EQ);
 


Mime
View raw message