Updated Branches: refs/heads/master 0984f4319 -> 53cea844b
The interface change introduced by commit 214bbf3ebd957f571901869f319da61ebad7ed23 broke the nonoss build. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/53cea844 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/53cea844 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/53cea844 Branch: refs/heads/master Commit: 53cea844bc14d50d7e578eb4269c8cafaa17c644 Parents: 0984f43 Author: Hugo Trippaers <[email protected]> Authored: Thu Oct 18 09:40:13 2012 +0200 Committer: Hugo Trippaers <[email protected]> Committed: Thu Oct 18 09:40:13 2012 +0200 ---------------------------------------------------------------------- .../network/element/CiscoNexusVSMElement.java | 2 +- .../element/F5ExternalLoadBalancerElement.java | 2 +- .../element/JuniperSRXExternalFirewallElement.java | 2 +- .../cloud/network/element/NetscalerElement.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/53cea844/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java index 80c8ecf..bdb235d 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java +++ b/plugins/hypervisors/vmware/src/com/cloud/network/element/CiscoNexusVSMElement.java @@ -110,7 +110,7 @@ public class CiscoNexusVSMElement extends CiscoNexusVSMDeviceManagerImpl impleme } @Override - public boolean destroy(Network network) + public boolean destroy(Network network, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { return true; } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/53cea844/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java index 13967e3..00114f2 100644 --- a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java +++ b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java @@ -166,7 +166,7 @@ public class F5ExternalLoadBalancerElement extends ExternalLoadBalancerDeviceMan } @Override - public boolean destroy(Network config) { + public boolean destroy(Network config, ReservationContext context) { return true; } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/53cea844/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 cd4a074..6e81547 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 @@ -203,7 +203,7 @@ public class JuniperSRXExternalFirewallElement extends ExternalFirewallDeviceMan } @Override - public boolean destroy(Network config) { + public boolean destroy(Network config, ReservationContext context) { return true; } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/53cea844/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java index 77aa447..7c51ff7 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java @@ -209,7 +209,7 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl } @Override - public boolean destroy(Network config) { + public boolean destroy(Network config, ReservationContext context) { return true; }
