From d3520a5d18c3c1f3179562bdaeef2274afeff055 Mon Sep 17 00:00:00 2001
From: Prachi Damle <prachi@cloud.com>
Date: Fri, 6 Dec 2013 12:56:51 -0800
Subject: [PATCH] CLOUDSTACK-5399: Add option to createVolume API to specify a
 VM, to place the volume appropriately and attach immediately

Fixing merge problem
---
 .../cloudstack/api/command/user/volume/CreateVolumeCmd.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
index 97db648e799..5dd14ac917a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/volume/CreateVolumeCmd.java
@@ -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;