cloudstack/engine
Edison Su 0824c78761 CLOUDSTACK-4939 - Failed to create snapshot (KVM, Multiple hosts, Sharedstorage)
Conflicts:

	engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
	engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
	plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java

Conflicts:

	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java
	plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
2013-12-19 14:17:30 -08:00
..
api CLOUDSTACK-4939 - Failed to create snapshot (KVM, Multiple hosts, Sharedstorage) 2013-12-19 14:17:30 -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 CLOUDSTACK-4939 - Failed to create snapshot (KVM, Multiple hosts, Sharedstorage) 2013-12-19 14:17:30 -08:00
pom.xml Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01:00