Edison Su 885bba926c should not duplicate vm instance id, during the volume migration ... Conflicts: engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java		2014-11-06 15:36:58 -08:00
..
resources/META-INF/cloudstack/core	Spring Modularization	2013-10-02 15:41:04 -07:00
src/org/apache/cloudstack/storage	should not duplicate vm instance id, during the volume migration	2014-11-06 15:36:58 -08:00
test	Reformatted all of the code.	2013-11-21 06:15:26 -08:00
pom.xml	Update master to 4.5.0-SNAPSHOT	2014-03-14 14:55:26 +01:00