cloudstack/engine
Edison Su 8caf52c6bc add xenserver 6.2.0 hotfix support, to optimize vdi copy
add xenserver hot fix

Conflicts:

	api/src/com/cloud/vm/VirtualMachineName.java
	core/src/com/cloud/host/HostInfo.java
	core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
	deps/XenServerJava/src/com/xensource/xenapi/VDI.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
	engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
	engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
	server/src/com/cloud/configuration/Config.java
2013-12-19 14:15:41 -08:00
..
api add xenserver 6.2.0 hotfix support, to optimize vdi copy 2013-12-19 14:15:41 -08:00
components-api CLOUDSTACK-4941: 2013-12-18 16:27:20 -08:00
network Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
orchestration add xenserver 6.2.0 hotfix support, to optimize vdi copy 2013-12-19 14:15:41 -08:00
schema add xenserver 6.2.0 hotfix support, to optimize vdi copy 2013-12-19 14:15:41 -08:00
service Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01:00
storage add xenserver 6.2.0 hotfix support, to optimize vdi copy 2013-12-19 14:15:41 -08:00
pom.xml Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01:00