cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [50/50] [abbrv] git commit: updated refs/heads/4.2 to a23322b
Date Mon, 26 Aug 2013 23:33:26 GMT
Merge branch '4.2-forward' into 4.2


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

Branch: refs/heads/4.2
Commit: a23322bf20766010129564d1af7d2d9addc77fa9
Parents: a70708d ad6fc9f
Author: Edison Su <sudison@gmail.com>
Authored: Mon Aug 26 16:18:12 2013 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Mon Aug 26 16:18:12 2013 -0700

----------------------------------------------------------------------
 client/tomcatconf/commands.properties.in        |   4 +-
 .../virtualnetwork/VirtualRoutingResource.java  |  35 ++
 docs/en-US/Developers_Guide.xml                 |   1 +
 docs/en-US/Release_Notes.xml                    |  94 ++---
 docs/en-US/about-primary-storage.xml            |   2 +-
 docs/en-US/about-secondary-storage.xml          |  22 +-
 docs/en-US/about-zones.xml                      |  16 +
 docs/en-US/basic-zone-configuration.xml         |   2 +-
 docs/en-US/images/vds-name.png                  | Bin 0 -> 64739 bytes
 docs/en-US/primary-storage-add.xml              |   6 +-
 docs/en-US/secondary-storage-add.xml            |  45 ++-
 docs/en-US/storage-plugins.xml                  | 144 ++++++++
 docs/en-US/vmware-cluster-config-dvswitch.xml   |  94 +++--
 docs/en-US/vmware-install.xml                   |   2 +-
 docs/en-US/zone-add.xml                         |  35 +-
 .../com/cloud/upgrade/dao/Upgrade410to420.java  |  23 +-
 .../storage/image/store/TemplateObject.java     |   4 +
 .../storage/test/ChildTestConfiguration.java    |   4 +-
 .../test/DirectAgentManagerSimpleImpl.java      |  15 +-
 .../storage/test/EndpointSelectorTest.java      | 327 ++++++++++++++++++
 .../test/FakeDriverTestConfiguration.java       |   9 +
 .../storage/test/MockStorageMotionStrategy.java |  17 +
 .../storage/test/SnapshotTestWithFakeData.java  | 170 +++++++--
 .../test/resource/fakeDriverTestContext.xml     |   1 +
 .../storage/snapshot/SnapshotObject.java        |  14 +
 .../snapshot/XenserverSnapshotStrategy.java     |  66 ++--
 .../endpoint/DefaultEndPointSelector.java       |  19 +-
 .../image/db/SnapshotDataStoreDaoImpl.java      |   4 +-
 .../storage/volume/VolumeServiceImpl.java       |   7 +-
 .../debian/config/etc/dnsmasq.conf.tmpl         |   2 +
 .../debian/config/etc/init.d/cloud-early-config |   3 +
 .../root/redundant_router/enable_pubip.sh.templ |  10 +-
 .../BareMetalPingServiceImpl.java               |  29 +-
 .../BaremetalDhcpManagerImpl.java               |  43 +--
 .../BaremetalDhcpResourceBase.java              |  13 -
 .../networkservice/BaremetalDhcpResponse.java   |  11 +
 .../BaremetalDnsmasqResource.java               |   4 +-
 .../BaremetalKickStartServiceImpl.java          |  38 +-
 .../networkservice/BaremetalPxeManager.java     |   5 +-
 .../networkservice/BaremetalPxeManagerImpl.java |   8 +-
 .../networkservice/BaremetalPxeResponse.java    |  18 +-
 .../networkservice/BaremetalPxeService.java     |   5 +-
 .../cloudstack/api/AddBaremetalDhcpCmd.java     |  14 +-
 .../cloudstack/api/AddBaremetalPxeCmd.java      |   6 +-
 .../cloudstack/api/ListBaremetalDhcpCmd.java    |  14 +-
 .../api/ListBaremetalPxePingServersCmd.java     |  97 ------
 .../api/ListBaremetalPxeServersCmd.java         |  79 +++++
 .../kvm/resource/LibvirtComputingResource.java  |  17 +-
 .../hypervisor/kvm/storage/KVMPhysicalDisk.java |   6 +-
 .../kvm/storage/KVMStoragePoolManager.java      |   3 +-
 .../kvm/storage/KVMStorageProcessor.java        |  11 +-
 .../kvm/storage/LibvirtStorageAdaptor.java      |  36 +-
 .../manager/VmwareStorageManagerImpl.java       |   3 +-
 .../vmware/resource/VmwareResource.java         |  57 ++-
 .../resource/VmwareStorageProcessor.java        |  85 ++++-
 .../xen/resource/XenServerStorageProcessor.java |   1 +
 .../driver/SolidfirePrimaryDataStoreDriver.java |  17 +-
 .../SolidFirePrimaryDataStoreLifeCycle.java     |  11 +
 .../storage/datastore/util/SolidFireUtil.java   |   2 +
 .../cloud/api/query/dao/VolumeJoinDaoImpl.java  |  19 +-
 .../com/cloud/network/NetworkManagerImpl.java   |  88 +++--
 .../com/cloud/resource/ResourceManagerImpl.java |  36 +-
 .../com/cloud/server/ManagementServerImpl.java  |   9 +-
 .../storage/snapshot/SnapshotManagerImpl.java   |  23 +-
 .../resource/NfsSecondaryStorageResource.java   |   8 +-
 setup/db/db/schema-410to420.sql                 |   2 +-
 .../component/test_affinity_groups.py           | 160 +++++----
 .../component/test_netscaler_configs.py         |  33 +-
 test/integration/component/test_netscaler_lb.py | 340 +++++++++---------
 .../component/test_netscaler_lb_algo.py         | 345 +++++++++----------
 .../component/test_netscaler_lb_sticky.py       |  49 ++-
 .../component/test_netscaler_nw_off.py          |  11 -
 .../component/test_network_offering.py          | 143 ++++++++
 .../integration/component/test_project_usage.py |   5 +-
 test/integration/component/test_routers.py      |  69 +++-
 test/integration/component/test_snapshot_gc.py  | 103 +-----
 .../component/test_snapshot_limits.py           |  98 +-----
 test/integration/component/test_snapshots.py    | 220 +-----------
 test/integration/component/test_stopped_vm.py   |   4 +-
 test/integration/component/test_usage.py        |   6 +-
 .../component/test_vpc_vm_life_cycle.py         |  40 ++-
 .../smoke/test_multipleips_per_nic.py           | 181 ++++++++++
 test/integration/smoke/test_nic.py              |  11 +-
 test/integration/smoke/test_routers.py          |  66 ++--
 tools/marvin/marvin/integration/lib/base.py     |   2 +
 tools/marvin/marvin/integration/lib/common.py   |  29 ++
 tools/marvin/marvin/integration/lib/utils.py    | 105 +++++-
 ui/scripts/system.js                            |  35 +-
 ui/scripts/ui-custom/zoneWizard.js              |  57 ++-
 ui/scripts/zoneWizard.js                        |  29 +-
 .../hypervisor/vmware/mo/VirtualMachineMO.java  |  29 +-
 91 files changed, 2667 insertions(+), 1518 deletions(-)
----------------------------------------------------------------------



Mime
View raw message