cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [50/50] git commit: updated refs/heads/4.3 to f304df0
Date Wed, 04 Jun 2014 23:51:02 GMT
Merge branch '4.3-forward' into 4.3


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f304df0b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f304df0b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f304df0b

Branch: refs/heads/4.3
Commit: f304df0be9dc2958ce81143f95784d02ea041ae0
Parents: 24e03be 1538594
Author: Edison Su <sudison@gmail.com>
Authored: Wed Jun 4 16:25:13 2014 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Wed Jun 4 16:25:13 2014 -0700

----------------------------------------------------------------------
 api/src/com/cloud/network/NetworkModel.java     |    4 +-
 awsapi/pom.xml                                  |   88 -
 core/src/com/cloud/info/ConsoleProxyInfo.java   |   20 +-
 developer/pom.xml                               |    1 +
 .../src/com/cloud/template/TemplateManager.java |    9 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java |   36 +-
 .../orchestration/VolumeOrchestrator.java       |   10 +-
 .../spring-engine-schema-core-daos-context.xml  |    2 +-
 .../datastore/db/PrimaryDataStoreDao.java       |    2 +
 .../datastore/db/PrimaryDataStoreDaoImpl.java   |   48 +-
 .../allocator/LocalStoragePoolAllocator.java    |    8 +-
 .../storage/volume/VolumeServiceImpl.java       |   10 +-
 .../AgentShell/AgentService.Designer.cs         |    2 +-
 .../ServerResource/AgentShell/AgentShell.csproj |    4 +
 .../DotNet/ServerResource/AgentShell/App.config |    7 +-
 .../HypervResource/CloudStackTypes.cs           |   47 +-
 .../HypervResource/HypervResource.csproj        |    4 +
 .../HypervResource/HypervResourceController.cs  |   73 +-
 .../ServerResource/HypervResource/Utils.cs      |    4 +-
 .../ServerResource.Tests.csproj                 |    4 +
 .../WmiWrappers/WmiWrappers.csproj              |    4 +
 .../kvm/resource/BridgeVifDriver.java           |    9 +-
 .../kvm/resource/LibvirtComputingResource.java  |    6 +-
 .../agent/manager/SimulatorManagerImpl.java     |    6 +-
 .../driver/SimulatorImageStoreDriverImpl.java   |    6 +
 .../vmware/manager/VmwareManagerImpl.java       |   85 +-
 python/lib/cloudutils/serviceConfig.py          |    3 -
 server/src/com/cloud/api/doc/Argument.java      |   14 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java   |    4 +-
 .../kvm/discoverer/LibvirtServerDiscoverer.java |   14 +-
 .../network/ExternalIpAddressAllocator.java     |    9 +-
 .../src/com/cloud/network/NetworkModelImpl.java |    4 +-
 .../com/cloud/network/NetworkServiceImpl.java   |   20 +-
 .../cloud/network/guru/GuestNetworkGuru.java    |    4 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java  |    5 +-
 .../com/cloud/projects/ProjectManagerImpl.java  |   46 +-
 .../com/cloud/template/TemplateManagerImpl.java |   35 +
 server/src/com/cloud/vm/UserVmManagerImpl.java  |   35 +-
 .../vm/snapshot/VMSnapshotManagerImpl.java      |    1 -
 .../com/cloud/network/MockNetworkModelImpl.java |    2 +-
 .../com/cloud/vpc/MockNetworkModelImpl.java     |    2 +-
 server/test/resources/createNetworkOffering.xml |    2 +
 setup/db/hypervisor_capabilities.simulator.sql  |   19 +
 .../component/test_multiple_ips_per_nic.py      |  452 ++++
 .../component/test_persistent_networks.py       | 2045 ++++++++++++++++--
 test/integration/component/test_portable_ip.py  |  132 +-
 test/integration/smoke/test_vm_life_cycle.py    |   84 +-
 tools/appliance/build.sh                        |    0
 .../definitions/systemvm64template/base.sh      |    8 +-
 .../definitions/systemvm64template/preseed.cfg  |    5 +
 .../definitions/systemvmtemplate/base.sh        |    8 +-
 .../definitions/systemvmtemplate/preseed.cfg    |    6 +
 tools/marvin/marvin/codes.py                    |    4 +
 tools/marvin/marvin/config/config.cfg           |  233 ++
 tools/marvin/marvin/integration/lib/base.py     |   36 +
 tools/marvin/marvin/integration/lib/common.py   |  107 +-
 56 files changed, 3265 insertions(+), 573 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f304df0b/awsapi/pom.xml
----------------------------------------------------------------------


Mime
View raw message