Projects >> accumulo >>360d596453efc990a9fd50492fad220908032f4e

Chunk
Conflicting content 
import java.util.Map;
import java.util.Set;

<<<<<<< HEAD
import org.apache.accumulo.core.client.impl.Tables;
=======
>>>>>>> fbbea9c30129e13046b1a969dff87235bd5d0fde
import org.apache.accumulo.core.client.security.SecurityErrorCode;
import org.apache.accumulo.core.data.ConstraintViolationSummary;
import org.apache.accumulo.core.data.KeyExtent;
Solution content 
import java.util.Map;
import java.util.Set;

import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.core.client.security.SecurityErrorCode;
import org.apache.accumulo.core.data.ConstraintViolationSummary;
import org.apache.accumulo.core.data.KeyExtent;
File
MutationsRejectedException.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
        af.put(entry.getKey(), codes);
      }
      
<<<<<<< HEAD
      throw new MutationsRejectedException(instance, cvsList, af, serverSideErrors, unknownErrors, lastUnknownError);
=======
      throw new MutationsRejectedException(cvsList, af, serverSideErrors, unknownErrors, lastUnknownError);
>>>>>>> fbbea9c30129e13046b1a969dff87235bd5d0fde
    }
  }
Solution content 
        af.put(entry.getKey(), codes);
      }
      
      throw new MutationsRejectedException(instance, cvsList, af, serverSideErrors, unknownErrors, lastUnknownError);
    }
  }
File
TabletServerBatchWriter.java
Developer's decision
Version 1
Kind of conflict
Throw statement