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
..
2013-09-06 15:40:37 -07:00
2013-09-30 09:51:45 -07:00
2013-10-16 09:21:00 -07:00
2013-10-05 12:18:34 -07:00
2013-10-24 15:54:49 -07:00
2013-05-11 15:28:43 +05:30
2013-05-11 15:28:43 +05:30