Alena Prokharchyk 1cff609347 Merge branch 'master' into internallb1 ... Conflicts: server/src/com/cloud/network/NetworkModelImpl.java server/src/com/cloud/network/NetworkServiceImpl.java server/src/com/cloud/server/ManagementServerImpl.java server/test/com/cloud/network/MockNetworkManagerImpl.java server/test/com/cloud/vpc/MockNetworkManagerImpl.java		2013-05-03 12:50:59 -07:00
..
acl/static-role-based	CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms	2013-02-20 16:42:56 +05:30
affinity-group-processors/host-anti-affinity	Single AffinityGroupProcessor could process multiple groups of same type.	2013-04-11 17:29:42 -07:00
alert-handlers	CLOUDSTACK-1993: fixed the issue of not sending syslog messages for alertType 0	2013-04-12 07:15:06 +05:30
api	marvin+apidiscovery: Extend API discovery plugin	2013-04-02 18:31:30 +05:30
deployment-planners	CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms	2013-02-20 16:42:56 +05:30
event-bus/rabbitmq	CLOUDSTACK-1391: EventBus is not getting injected after javelin merge	2013-02-27 18:55:22 +05:30
file-systems/netapp	CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms	2013-02-20 16:42:56 +05:30
host-allocators/random	Storage motion for Xenserver changes: 1. Implemented Api findStoragePoolsForMigration. Added a new response objects to list storage pools available for migration. 2. Updated migrateVolume api for allowing migrating volumes of running vms. These changes are integrated into the latest storage refactoring changes. 3. Added the implementation for findHostsForMigration api. It lists the hosts to which an instance can be migrated, including hosts from within and across clusters to which an instance may be migrated with storage motion. The work of migrating a volume of a running vm is also done in copyAsync. 4. Updated the listHosts api for backward compatibility. 5. Added the implementation for migrateVirtualMachineWithVolume api. It migrates an instance with its volumes within a cluster and also across clusters. Also introduced a new XenServerStorageMotionStrategy for migrating volumes of a vm. When a vm is being migrated with its volumes, the vm is put in migrating state and a request is send to the volume manager to migrate the vm and its volumes. Volume manager calls into the volume service which forwards the request to data motion service after moving all the volumes to migrating state. Data motion service enumerates the strategies and the request reaches the XenServerStorageMotionStrategy. It calls in to the resource to complete the operation. 6. Resolved an issue where storage xenmotion of 2nd VM created from the same template to a host was failing with duplicate_vm exception. Made changes to remove the mac_seed key value pair from other_config when vms are created. This is was storage motion to fail. 7. Updated the db upgrade schema script. 8. Added the right permissions in commands.properties 9. Marvin tests for testing storage motion. Following scenarios are tested. 9.1. A virtual machine is migrated to another host. Its volumes are also migrated to another storage pool. 9.2. Just the volumes of a vm are migrated to another storage pool while the vm continues to run on the same host. 10. Unit tests for testing migration of a vm with its volumes.	2013-04-19 11:36:42 +05:30
hypervisors	Fixing build breakage.	2013-05-02 17:10:21 +05:30
network-elements	Merge branch 'master' into internallb1	2013-05-03 12:50:59 -07:00
storage	Fix CLOUDSTACK-2062 NPE while deleting the primary storage[Added with scope=cluster]	2013-04-17 22:06:45 +08:00
storage-allocators/random	fix compile	2013-02-26 21:44:44 -08:00
user-authenticators	CLOUDSTACK-1734: Make SHA1 default password encoding mechanism	2013-04-02 17:40:50 -07:00
pom.xml	Merge branch 'master' into internallb1	2013-05-01 10:39:10 -07:00