You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/01/17 15:51:10 UTC
[2/3] git commit: Merge branch 'javelin' of
https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
Merge branch 'javelin' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack into javelin
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b751b69c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b751b69c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b751b69c
Branch: refs/heads/javelin
Commit: b751b69c55724dfb402533016b1fa51133ce303d
Parents: 9759ad5 497dcd5
Author: Alex Huang <al...@citrix.com>
Authored: Thu Jan 17 06:50:19 2013 -0800
Committer: Alex Huang <al...@citrix.com>
Committed: Thu Jan 17 06:50:19 2013 -0800
----------------------------------------------------------------------
api/src/org/apache/cloudstack/api/PlugService.java | 31 ---
.../router/ConfigureVirtualRouterElementCmd.java | 11 +-
.../router/CreateVirtualRouterElementCmd.java | 12 +-
.../admin/router/ListVirtualRouterElementsCmd.java | 10 +-
client/tomcatconf/componentContext.xml.in | 169 ++++++++++++++-
core/src/com/cloud/storage/VolumeVO.java | 4 +-
developer/pom.xml | 132 +-----------
.../acl/StaticRoleBasedAPIAccessChecker.java | 1 -
.../api/command/user/discovery/ListApisCmd.java | 5 +-
.../cloud/deploy/UserConcentratedPodPlanner.java | 2 -
.../com/cloud/deploy/UserDispersingPlanner.java | 2 -
.../com/cloud/ovm/hypervisor/OvmDiscoverer.java | 2 -
.../src/com/cloud/ovm/hypervisor/OvmFencer.java | 14 +-
.../ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java | 3 -
.../cloud/api/commands/DeleteCiscoNexusVSMCmd.java | 5 +-
.../api/commands/DisableCiscoNexusVSMCmd.java | 5 +-
.../cloud/api/commands/EnableCiscoNexusVSMCmd.java | 4 +-
.../cloud/api/commands/ListCiscoNexusVSMsCmd.java | 5 +-
.../xen/src/com/cloud/ha/XenServerFencer.java | 5 +-
.../src/com/cloud/hypervisor/XenServerGuru.java | 5 -
.../xen/discoverer/XcpServerDiscoverer.java | 2 -
.../api/commands/AddExternalLoadBalancerCmd.java | 5 +-
.../cloud/api/commands/AddF5LoadBalancerCmd.java | 4 +-
.../api/commands/ConfigureF5LoadBalancerCmd.java | 4 +-
.../commands/DeleteExternalLoadBalancerCmd.java | 4 +-
.../api/commands/DeleteF5LoadBalancerCmd.java | 5 +-
.../api/commands/ListExternalLoadBalancersCmd.java | 4 +-
.../commands/ListF5LoadBalancerNetworksCmd.java | 5 +-
.../cloud/api/commands/ListF5LoadBalancersCmd.java | 4 +-
.../cloud/api/commands/AddExternalFirewallCmd.java | 5 +-
.../com/cloud/api/commands/AddSrxFirewallCmd.java | 5 +-
.../api/commands/ConfigureSrxFirewallCmd.java | 5 +-
.../api/commands/DeleteExternalFirewallCmd.java | 5 +-
.../cloud/api/commands/DeleteSrxFirewallCmd.java | 5 +-
.../api/commands/ListExternalFirewallsCmd.java | 5 +-
.../api/commands/ListSrxFirewallNetworksCmd.java | 4 +-
.../cloud/api/commands/ListSrxFirewallsCmd.java | 4 +-
.../api/commands/AddNetscalerLoadBalancerCmd.java | 4 +-
.../ConfigureNetscalerLoadBalancerCmd.java | 4 +-
.../commands/DeleteNetscalerLoadBalancerCmd.java | 5 +-
.../ListNetscalerLoadBalancerNetworksCmd.java | 5 +-
.../commands/ListNetscalerLoadBalancersCmd.java | 5 +-
.../cloud/api/commands/AddNiciraNvpDeviceCmd.java | 4 +-
.../api/commands/DeleteNiciraNvpDeviceCmd.java | 5 +-
.../commands/ListNiciraNvpDeviceNetworksCmd.java | 5 +-
.../api/commands/ListNiciraNvpDevicesCmd.java | 5 +-
.../network/guru/NiciraNvpGuestNetworkGuru.java | 3 -
.../cloud/network/guru/OvsGuestNetworkGuru.java | 9 -
.../cloud/server/auth/LDAPUserAuthenticator.java | 3 -
.../cloud/server/auth/MD5UserAuthenticator.java | 4 -
.../manager/allocator/impl/FirstFitAllocator.java | 10 +-
.../allocator/impl/FirstFitRoutingAllocator.java | 2 -
.../allocator/impl/UserConcentratedAllocator.java | 14 +-
server/src/com/cloud/api/ApiDispatcher.java | 6 -
.../src/com/cloud/async/AsyncJobManagerImpl.java | 3 +
.../com/cloud/baremetal/BareMetalDiscoverer.java | 2 -
server/src/com/cloud/baremetal/BareMetalGuru.java | 4 -
.../consoleproxy/ConsoleProxyBalanceAllocator.java | 13 +-
server/src/com/cloud/deploy/BareMetalPlanner.java | 12 +-
server/src/com/cloud/deploy/FirstFitPlanner.java | 2 -
.../src/com/cloud/ha/AbstractInvestigatorImpl.java | 10 +-
.../src/com/cloud/ha/CheckOnAgentInvestigator.java | 2 -
server/src/com/cloud/ha/KVMFencer.java | 12 +-
.../cloud/ha/ManagementIPSystemVMInvestigator.java | 2 -
.../src/com/cloud/ha/UserVmDomRInvestigator.java | 2 -
server/src/com/cloud/ha/XenServerInvestigator.java | 2 -
server/src/com/cloud/hypervisor/KVMGuru.java | 3 -
.../src/com/cloud/hypervisor/guru/HypervGuru.java | 1 -
.../hypervisor/hyperv/HypervServerDiscoverer.java | 2 -
.../kvm/discoverer/KvmServerDiscoverer.java | 2 -
.../cloud/network/ExteralIpAddressAllocator.java | 5 +-
.../com/cloud/network/guru/ControlNetworkGuru.java | 2 -
.../com/cloud/network/guru/DirectNetworkGuru.java | 2 -
.../network/guru/DirectPodBasedNetworkGuru.java | 2 -
.../network/guru/ExternalGuestNetworkGuru.java | 5 -
.../cloud/network/guru/PodBasedNetworkGuru.java | 2 -
.../com/cloud/network/guru/PrivateNetworkGuru.java | 2 -
.../com/cloud/network/guru/PublicNetworkGuru.java | 2 -
.../com/cloud/network/guru/StorageNetworkGuru.java | 5 -
server/src/com/cloud/resource/DiscovererBase.java | 10 +-
.../server/auth/DefaultUserAuthenticator.java | 4 +-
.../allocator/FirstFitStoragePoolAllocator.java | 2 -
.../allocator/LocalStoragePoolAllocator.java | 2 -
.../secondary/SecondaryStorageDiscoverer.java | 2 -
.../src/com/cloud/utils/component/AdapterBase.java | 6 +-
85 files changed, 312 insertions(+), 410 deletions(-)
----------------------------------------------------------------------