Merge branch 'master' into marvin_refactor
Conflicts:
utils/src/com/cloud/utils/component/ComponentContext.java
Signed-off-by: Prasanna Santhanam <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/db2593ff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/db2593ff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/db2593ff
Branch: refs/heads/marvin_refactor
Commit: db2593ffd006939382097a247b37024f22e84064
Parents: 5b079c6 b0bbffb
Author: Prasanna Santhanam <[email protected]>
Authored: Mon Apr 15 11:08:28 2013 +0530
Committer: Prasanna Santhanam <[email protected]>
Committed: Mon Apr 15 11:08:28 2013 +0530
----------------------------------------------------------------------
DISCLAIMER | 7 -
.../cloud/configuration/ConfigurationService.java | 6 +
api/src/com/cloud/event/EventTypes.java | 4 +
api/src/com/cloud/network/NetworkService.java | 2 +-
api/src/com/cloud/vm/DiskProfile.java | 2 +-
.../admin/vlan/DedicatePublicIpRangeCmd.java | 108 +
.../admin/vlan/ReleasePublicIpRangeCmd.java | 77 +
.../command/user/address/AssociateIPAddrCmd.java | 31 +-
.../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 3 +
.../api/response/GlobalLoadBalancerResponse.java | 8 +
client/tomcatconf/applicationContext.xml.in | 6 +-
client/tomcatconf/commands.properties.in | 2 +
client/tomcatconf/nonossComponentContext.xml.in | 8 +
core/src/com/cloud/vm/VmDetailConstants.java | 1 +
debian/cloudstack-awsapi.install | 10 +-
debian/rules | 20 +-
docs/en-US/Release_Notes.xml | 4176 ++++++++++++++-
docs/en-US/hypervisor-kvm-install-flow.xml | 1 +
.../subsystem/api/storage/CommandResult.java | 2 +-
.../api/storage/ObjectInDataStoreStateMachine.java | 2 +-
.../image/motion/DefaultImageMotionStrategy.java | 4 +-
.../cloudstack/storage/test/DirectAgentTest.java | 4 +-
.../test/MockHypervisorHostEndPointRpcServer.java | 72 +
.../test/MockHypervsiorHostEndPointRpcServer.java | 72 -
.../integration-test/test/resource/component.xml | 2 +-
.../storage/HypervisorHostEndPointRpcServer.java | 119 +
.../storage/HypervsiorHostEndPointRpcServer.java | 119 -
.../allocator/AbstractStoragePoolAllocator.java | 2 +-
.../allocator/ZoneWideStoragePoolAllocator.java | 2 +-
.../command/CreateVolumeFromBaseImageCommand.java | 6 +-
.../storage/datastore/DataObjectManagerImpl.java | 6 +-
.../provider/DataStoreProviderManagerImpl.java | 4 +-
.../storage/to/ImageOnPrimaryDataStoreTO.java | 44 +
.../storage/to/ImageOnPrimayDataStoreTO.java | 44 -
.../driver/DefaultPrimaryDataStoreDriverImpl.java | 4 +-
.../DefaultPrimaryDatastoreProviderImpl.java | 6 +-
.../volume/TemplateInstallStrategyImpl.java | 6 +-
.../src/com/cloud/hypervisor/guru/VMwareGuru.java | 19 +-
.../hypervisor/vmware/resource/VmwareResource.java | 18 +
.../xen/resource/XenServerStorageResource.java | 4 +-
.../dns-notifier/resources/components-example.xml | 2 +-
.../element/F5ExternalLoadBalancerElement.java | 15 +-
.../element/JuniperSRXExternalFirewallElement.java | 58 +-
.../cloud/network/element/NetscalerElement.java | 3 +-
.../CloudStackPrimaryDataStoreProviderImpl.java | 6 +-
server/src/com/cloud/api/ApiResponseHelper.java | 2 +
.../src/com/cloud/api/query/QueryManagerImpl.java | 69 +-
server/src/com/cloud/configuration/Config.java | 1 +
.../cloud/configuration/ConfigurationManager.java | 5 +-
.../configuration/ConfigurationManagerImpl.java | 173 +-
.../AgentBasedConsoleProxyManager.java.orig | 298 -
.../cloud/network/ExteralIpAddressAllocator.java | 165 -
.../cloud/network/ExternalIpAddressAllocator.java | 165 +
server/src/com/cloud/network/IpAddrAllocator.java | 2 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 317 +-
server/src/com/cloud/network/NetworkModelImpl.java | 5 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 109 +-
.../src/com/cloud/server/ManagementServerImpl.java | 3 +
.../com/cloud/template/TemplateManagerImpl.java | 2 +-
server/src/com/cloud/user/AccountManagerImpl.java | 6 +-
.../configuration/ConfigurationManagerTest.java | 413 ++
.../com/cloud/network/MockNetworkManagerImpl.java | 38 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 23 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 54 +-
server/test/resources/network-mgr-component.xml | 2 +-
test/integration/smoke/test_public_ip_range.py | 173 +
tools/apidoc/gen_toc.py | 1 +
tools/build/build_docs.sh | 19 +-
tools/marvin/marvin/integration/lib/oldbase.py | 19 +-
.../cloud/utils/component/ComponentContext.java | 18 +-
70 files changed, 5791 insertions(+), 1408 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db2593ff/server/src/com/cloud/network/NetworkServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db2593ff/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db2593ff/tools/apidoc/gen_toc.py
----------------------------------------------------------------------
