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
..
bindir	Fixed sysvmadm helper script (responsible for restarting/recreating VRs when needed on upgraded setups due to template changes) to have -v option. When -v is specified, all VPCs in the system will get restarted. As a part of the restart, VPC routers will get recreated	2013-09-19 10:29:41 -07:00
db	Merge branch 'pluggable_vm_snapshot'	2013-10-25 16:47:17 -07:00
dev	marvin: a1b979da8 breaks formatting and pep8.	2013-10-22 11:59:14 +05:30