You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/11/24 14:03:20 UTC
[1/2] git commit: updated refs/heads/master to 5b8fc22
Repository: cloudstack
Updated Branches:
refs/heads/master 8afda59ff -> 5b8fc22be
PR1102 regression fix; half the annotation was removed at several locations
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4bc6bcfa
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4bc6bcfa
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4bc6bcfa
Branch: refs/heads/master
Commit: 4bc6bcfa9ad5bedc9ea39c09f46ad69624f0f27d
Parents: 8afda59
Author: Daan Hoogland <da...@gmail.com>
Authored: Mon Nov 23 17:26:11 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Nov 23 19:18:35 2015 +0100
----------------------------------------------------------------------
.../cloud/network/element/JuniperSRXExternalFirewallElement.java | 1 -
.../nuage-vsp/src/com/cloud/network/element/NuageVspElement.java | 1 -
2 files changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4bc6bcfa/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
index 52ca472..baa0512 100644
--- a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
+++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
@@ -88,7 +88,6 @@ import com.cloud.vm.NicProfile;
import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachineProfile;
- RemoteAccessVPNServiceProvider.class})
public class JuniperSRXExternalFirewallElement extends ExternalFirewallDeviceManagerImpl implements SourceNatServiceProvider, FirewallServiceProvider,
PortForwardingServiceProvider, IpDeployer, JuniperSRXFirewallElementService, StaticNatServiceProvider {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4bc6bcfa/plugins/network-elements/nuage-vsp/src/com/cloud/network/element/NuageVspElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nuage-vsp/src/com/cloud/network/element/NuageVspElement.java b/plugins/network-elements/nuage-vsp/src/com/cloud/network/element/NuageVspElement.java
index 66fbaff..cb0d698 100644
--- a/plugins/network-elements/nuage-vsp/src/com/cloud/network/element/NuageVspElement.java
+++ b/plugins/network-elements/nuage-vsp/src/com/cloud/network/element/NuageVspElement.java
@@ -101,7 +101,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
- DhcpServiceProvider.class, VpcProvider.class, NetworkACLServiceProvider.class})
public class NuageVspElement extends AdapterBase implements ConnectivityProvider, IpDeployer, SourceNatServiceProvider, StaticNatServiceProvider, FirewallServiceProvider,
DhcpServiceProvider, ResourceStateAdapter, VpcProvider, NetworkACLServiceProvider {
[2/2] git commit: updated refs/heads/master to 5b8fc22
Posted by da...@apache.org.
Merge pull request #1110 from DaanHoogland/PR1102-fix
PR1102 regression fix; half the annotation was removedI am having troubles getting this to work but it passes the point at which the master slowbuild is broken.
* pr/1110:
PR1102 regression fix; half the annotation was removed at several locations
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5b8fc22b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5b8fc22b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5b8fc22b
Branch: refs/heads/master
Commit: 5b8fc22be2522be85db82ed9905f69e28b7a6918
Parents: 8afda59 4bc6bcf
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Nov 24 14:02:50 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Tue Nov 24 14:02:50 2015 +0100
----------------------------------------------------------------------
.../cloud/network/element/JuniperSRXExternalFirewallElement.java | 1 -
.../nuage-vsp/src/com/cloud/network/element/NuageVspElement.java | 1 -
2 files changed, 2 deletions(-)
----------------------------------------------------------------------