CLOUDSTACK-5399: Add option to createVolume API to specify a VM, to place the volume appropriately and attach immediately

Fixing merge problem
This commit is contained in:
Prachi Damle 2013-12-06 12:56:51 -08:00
parent 13d2caa6b5
commit d3520a5d18
1 changed files with 1 additions and 2 deletions

View File

@ -30,9 +30,8 @@ import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.BaseAsyncCreateCmd;
import com.cloud.event.EventTypes;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.storage.Snapshot;