Updated Branches: refs/heads/master 214bbf3eb -> 1c32024a5
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1c32024a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1c32024a Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1c32024a Branch: refs/heads/master Commit: 1c32024a56eeedcaa20f51d8d11cb18e4feed128 Parents: 3287723 214bbf3 Author: David Nalley <[email protected]> Authored: Wed Oct 17 20:38:58 2012 -0400 Committer: David Nalley <[email protected]> Committed: Wed Oct 17 20:38:58 2012 -0400 ---------------------------------------------------------------------- .../api/commands/DeleteRemoteAccessVpnCmd.java | 5 ++- .../com/cloud/api/commands/DeleteVolumeCmd.java | 2 +- .../com/cloud/api/commands/DestroyRouterCmd.java | 6 +++- .../com/cloud/api/commands/RemoveVpnUserCmd.java | 2 +- .../network/VirtualNetworkApplianceService.java | 3 +- .../com/cloud/network/element/NetworkElement.java | 3 +- api/src/com/cloud/network/element/VpcProvider.java | 3 +- .../cloud/network/vpn/RemoteAccessVpnService.java | 5 ++- api/src/com/cloud/storage/StorageService.java | 4 ++- .../element/ElasticLoadBalancerElement.java | 2 +- .../cloud/network/element/NiciraNvpElement.java | 2 +- .../src/com/cloud/network/element/OvsElement.java | 2 +- .../src/com/cloud/network/NetworkManagerImpl.java | 4 +- .../cloud/network/element/BareMetalElement.java | 2 +- .../network/element/CloudZonesNetworkElement.java | 2 +- .../cloud/network/element/ExternalDhcpElement.java | 2 +- .../network/element/SecurityGroupElement.java | 2 +- .../network/element/VirtualRouterElement.java | 8 +++--- .../network/element/VpcVirtualRouterElement.java | 6 ++-- .../router/VirtualNetworkApplianceManagerImpl.java | 15 ++++++---- server/src/com/cloud/network/vpc/VpcManager.java | 4 ++- .../src/com/cloud/network/vpc/VpcManagerImpl.java | 20 +++++++------- .../network/vpn/RemoteAccessVpnManagerImpl.java | 8 +---- .../src/com/cloud/projects/ProjectManagerImpl.java | 4 ++- server/src/com/cloud/storage/StorageManager.java | 6 +++- .../src/com/cloud/storage/StorageManagerImpl.java | 7 +---- server/src/com/cloud/user/AccountManagerImpl.java | 10 +++--- server/test/com/cloud/vpc/MockVpcManagerImpl.java | 2 +- server/test/com/cloud/vpc/VpcApiUnitTest.java | 2 +- .../cloud/vpc/dao/MockVpcVirtualRouterElement.java | 3 +- 30 files changed, 78 insertions(+), 68 deletions(-) ----------------------------------------------------------------------
