etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/plugins/hypervisors
History
Edison Su 51a8086cf6 Merge branch 'pluggable_vm_snapshot' 
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
	engine/storage/integration-test/test/resources/storageContext.xml
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
 		2013-10-25 16:47:17 -07:00
..
baremetal Add missing licenses 2013-10-23 15:20:08 -07:00
kvm Add missing licenses 2013-10-23 15:20:08 -07:00
ovm Add missing licenses 2013-10-23 15:20:08 -07:00
simulator Add missing licenses 2013-10-23 15:20:08 -07:00
ucs Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
vmware Merge branch 'pluggable_vm_snapshot' 2013-10-25 16:47:17 -07:00
xen Merge branch 'pluggable_vm_snapshot' 2013-10-25 16:47:17 -07:00