Projects >> eucalyptus >>6b29b8f4c79021f93fb4ad3c6f520f161ad1cf2e

Chunk
Conflicting content 
import java.util.Set;
import javax.persistence.EntityTransaction;

<<<<<<< HEAD
import com.eucalyptus.blockstorage.Volume;
import com.eucalyptus.blockstorage.Volumes;
import com.eucalyptus.cloud.util.InvalidMetadataException;
import com.eucalyptus.cloud.util.NoSuchMetadataException;
import com.eucalyptus.images.KernelImageInfo;
import com.eucalyptus.images.RamdiskImageInfo;
import com.eucalyptus.images.Images;
import com.eucalyptus.network.NetworkGroup;
import com.eucalyptus.vmtypes.VmType;
import com.eucalyptus.vmtypes.VmTypes;
=======
import com.google.common.base.Joiner;
>>>>>>> 93b9ff5e5a0c5c7a186987522bfd51e974812e5e
import org.apache.log4j.Logger;
import org.bouncycastle.util.encoders.Base64;
import org.mule.RequestContext;
Solution content 
import com.eucalyptus.vmtypes.VmType;
import java.util.Set;
import javax.persistence.EntityTransaction;

import com.eucalyptus.blockstorage.Volume;
import com.eucalyptus.blockstorage.Volumes;
import com.eucalyptus.cloud.util.InvalidMetadataException;
import com.eucalyptus.cloud.util.NoSuchMetadataException;
import com.eucalyptus.images.KernelImageInfo;
import com.eucalyptus.images.RamdiskImageInfo;
import com.eucalyptus.images.Images;
import com.eucalyptus.network.NetworkGroup;
import com.eucalyptus.vmtypes.VmTypes;
import com.google.common.base.Joiner;
import org.apache.log4j.Logger;
import org.bouncycastle.util.encoders.Base64;
import org.mule.RequestContext;
File
VmControl.java
Developer's decision
Concatenation
Kind of conflict
Import