Projects >> eucalyptus >>b2497e4af7470f55b82f2147efb621a64ac56305

Chunk
Conflicting content 
=======
import javax.persistence.Table;

import org.apache.log4j.Logger;
<<<<<<< HEAD
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;

import com.eucalyptus.blockstorage.ceph.exceptions.EucalyptusCephException;
>>>>>>> 08e37b5d3b17cfc542c879d080233a914e50989a
import com.eucalyptus.blockstorage.util.StorageProperties;
import com.eucalyptus.configurable.ConfigurableClass;
import com.eucalyptus.configurable.ConfigurableField;
Solution content 
import javax.persistence.Table;

import org.apache.log4j.Logger;

import com.eucalyptus.blockstorage.ceph.exceptions.EucalyptusCephException;
import com.eucalyptus.blockstorage.util.StorageProperties;
import com.eucalyptus.configurable.ConfigurableClass;
import com.eucalyptus.configurable.ConfigurableField;
File
CephRbdInfo.java
Developer's decision
Combination
Kind of conflict
Import