Projects >> eucalyptus >>f6a7ec699d9fd0b543f11cd4807d0e6aacfaef99

Chunk
Conflicting content 
import com.eucalyptus.ws.WebServicesException;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
<<<<<<< HEAD
=======
import com.google.common.base.Strings;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.HashBasedTable;
>>>>>>> da360e7874b1c8c1ddb378b710724d20cb053d60
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.ObjectArrays;
Solution content 
import com.eucalyptus.ws.WebServicesException;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Strings;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.ObjectArrays;
File
Cluster.java
Developer's decision
Combination
Kind of conflict
Import