From 4bc6bcfa9ad5bedc9ea39c09f46ad69624f0f27d Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 23 Nov 2015 17:26:11 +0100 Subject: [PATCH] PR1102 regression fix; half the annotation was removed at several locations --- .../cloud/network/element/JuniperSRXExternalFirewallElement.java | 1 - .../nuage-vsp/src/com/cloud/network/element/NuageVspElement.java | 1 - 2 files changed, 2 deletions(-) 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 52ca472ea52..baa05124983 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 { 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 66fbaffbbba..cb0d698c2b1 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 {