cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 5b8fc22
Date Tue, 24 Nov 2015 13:03:20 GMT
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 <daan.hoogland@gmail.com>
Authored: Mon Nov 23 17:26:11 2015 +0100
Committer: Daan Hoogland <daan@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
{
 


Mime
View raw message