You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/11/12 20:16:08 UTC
[1/2] git commit: updated refs/heads/4.3 to 8c61117
Updated Branches:
refs/heads/4.3 71993c10d -> 8c6111736
Added log directory to .gitignore
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1585b23e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1585b23e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1585b23e
Branch: refs/heads/4.3
Commit: 1585b23eb33e8a76d9476b2fa0fe6f153a5a86ac
Parents: 71993c1
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Nov 11 09:15:53 2013 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Tue Nov 12 11:02:55 2013 -0800
----------------------------------------------------------------------
.gitignore | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1585b23e/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 5efa7bb..8e3b052 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# Licensed to the Apache Software Foundation (ASF) under one
+G# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
@@ -83,3 +83,5 @@ build-indep-stamp
configure-stamp
*_flymake.js
engine/storage/integration-test/test-output
+tools/apidoc/log/
+log/
[2/2] git commit: updated refs/heads/4.3 to 8c61117
Posted by al...@apache.org.
Added resource metadata support for PF rules
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8c611173
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8c611173
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8c611173
Branch: refs/heads/4.3
Commit: 8c61117369c6dc39c233bd6665f6c94bc8e812e0
Parents: 1585b23
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Tue Nov 12 09:20:28 2013 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Tue Nov 12 11:03:10 2013 -0800
----------------------------------------------------------------------
api/src/com/cloud/server/ResourceTag.java | 2 +-
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c611173/api/src/com/cloud/server/ResourceTag.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/server/ResourceTag.java b/api/src/com/cloud/server/ResourceTag.java
index 47e00be..35efcf0 100644
--- a/api/src/com/cloud/server/ResourceTag.java
+++ b/api/src/com/cloud/server/ResourceTag.java
@@ -32,7 +32,7 @@ public interface ResourceTag extends ControlledEntity, Identity, InternalIdentit
Network (true, true),
Nic (false, true),
LoadBalancer (true, false),
- PortForwardingRule (true, false),
+ PortForwardingRule (true, true),
FirewallRule (true, true),
SecurityGroup (true, false),
PublicIpAddress (true, true),
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c611173/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
index 4ebc43e..8c4415c 100644
--- a/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
+++ b/server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
@@ -95,6 +95,7 @@ public class ResourceMetaDataManagerImpl extends ManagerBase implements Resource
_daoMap.put(ResourceObjectType.Storage, _storageDetailsDao);
_daoMap.put(ResourceObjectType.FirewallRule, _firewallRuleDetailsDao);
_daoMap.put(ResourceObjectType.PublicIpAddress, _userIpAddressDetailsDao);
+ _daoMap.put(ResourceObjectType.PortForwardingRule, _firewallRuleDetailsDao);
return true;
}