cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject git commit: updated refs/heads/master to e52cde5
Date Mon, 15 Jul 2013 17:24:44 GMT
Updated Branches:
  refs/heads/master ecdb70031 -> e52cde587


CLOUDSTACK-3346: Fixed setting up resourceTags for network ACL - added missing @Inject when
load NetworkACLItemDao


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

Branch: refs/heads/master
Commit: e52cde5878d597901cf7e329ced4465260222b8c
Parents: ecdb700
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Mon Jul 15 10:19:22 2013 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Mon Jul 15 10:24:37 2013 -0700

----------------------------------------------------------------------
 server/src/com/cloud/tags/TaggedResourceManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e52cde58/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
index f58c5d7..5f25499 100644
--- a/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
+++ b/server/src/com/cloud/tags/TaggedResourceManagerImpl.java
@@ -121,6 +121,7 @@ public class TaggedResourceManagerImpl extends ManagerBase implements
TaggedReso
     VMSnapshotDao _vmSnapshotDao;
     @Inject
     NicDao _nicDao;
+    @Inject
     NetworkACLItemDao _networkACLItemDao;
 
 
@@ -139,7 +140,6 @@ public class TaggedResourceManagerImpl extends ManagerBase implements
TaggedReso
         _daoMap.put(TaggedResourceType.PublicIpAddress, _publicIpDao);
         _daoMap.put(TaggedResourceType.Project, _projectDao);
         _daoMap.put(TaggedResourceType.Vpc, _vpcDao);
-        _daoMap.put(TaggedResourceType.NetworkACL, _firewallDao);
         _daoMap.put(TaggedResourceType.Nic, _nicDao);
         _daoMap.put(TaggedResourceType.NetworkACL, _networkACLItemDao);
         _daoMap.put(TaggedResourceType.StaticRoute, _staticRouteDao);


Mime
View raw message