Projects >> CloudStack-archive >>46c331b54bf21ac1280579fd5b9db8a27638fd3b

Chunk
Conflicting content 
import com.cloud.agent.manager.AgentManager;
import com.cloud.alert.AlertManager;
import com.cloud.api.BaseCmd;
<<<<<<< HEAD
import com.cloud.api.ServerApiException;
import com.cloud.api.commands.DeletePoolCmd;
=======
import com.cloud.api.commands.StopVMCmd;
>>>>>>> 6ca1ceb76992f415f2f7e509e19a057b00ef88e2
import com.cloud.api.commands.UpdateStoragePoolCmd;
import com.cloud.async.AsyncInstanceCreateStatus;
import com.cloud.async.AsyncJobExecutor;
Solution content 
import com.cloud.agent.manager.AgentManager;
import com.cloud.alert.AlertManager;
import com.cloud.api.BaseCmd;
import com.cloud.api.ServerApiException;
import com.cloud.api.commands.DeletePoolCmd;
import com.cloud.api.commands.StopVMCmd;
import com.cloud.api.commands.UpdateStoragePoolCmd;
import com.cloud.async.AsyncInstanceCreateStatus;
import com.cloud.async.AsyncJobExecutor;
File
StorageManagerImpl.java
Developer's decision
Concatenation
Kind of conflict
Import