cloudstack/engine/storage
Darren Shepherd 205a77a5bb Merge remote-tracking branch 'origin/txn-refactor'
Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2013-10-23 10:40:44 -07:00
..
cache Temporary fix for the chicken and egg problem when making changes to the configuration database. 2013-10-03 12:36:34 +02:00
datamotion Added categorized sorting to SnapshotStrategy and DataMotionStrategy 2013-10-14 15:20:42 -07:00
image CLOUDSTACK-3472: [Object_Store_Refactor] System VMs are not coming up in 2013-10-17 15:59:10 -07:00
integration-test Added categorized sorting to SnapshotStrategy and DataMotionStrategy 2013-10-14 15:20:42 -07:00
snapshot Added categorized sorting to SnapshotStrategy and DataMotionStrategy 2013-10-14 15:20:42 -07:00
src/org/apache/cloudstack/storage Merge remote-tracking branch 'origin/txn-refactor' 2013-10-23 10:40:44 -07:00
volume CLOUDSTACK-3737: 2013-10-21 14:54:42 -07:00
pom.xml Updating pom.xml version numbers for release 4.3.0-SNAPSHOT 2013-08-01 10:35:00 -04:00
storage.ucls Fix license on xml.in, jsp and ucls files on javelin 2013-01-12 06:34:34 -08:00