Projects >> hadoop-common >>4117c09fc935a1e4b1031a01ee688d787cea9e4b

Chunk
Conflicting content 
 * 
 * This is NOT a public interface!
 */
<<<<<<< HEAD
public class JobInProgress {
=======
class JobInProgress {
  /**
   * Used when the a kill is issued to a job which is initializing.
   */
  static class KillInterruptedException extends InterruptedException {
   private static final long serialVersionUID = 1L;
    public KillInterruptedException(String msg) {
      super(msg);
    }
  }

>>>>>>> 0d4f44c00118954d66d06cb301fcb0189226b9fb
  static final Log LOG = LogFactory.getLog(JobInProgress.class);
    
  JobProfile profile;
Solution content 
 */
public class JobInProgress {
  /**
   * Used when the a kill is issued to a job which is initializing.
   */
  static class KillInterruptedException extends InterruptedException {
   private static final long serialVersionUID = 1L;
    public KillInterruptedException(String msg) {
      super(msg);
    }
  }

  static final Log LOG = LogFactory.getLog(JobInProgress.class);
    
  JobProfile profile;
File
JobInProgress.java
Developer's decision
Combination
Kind of conflict
Class declaration
Class signature
Comment
Chunk
Conflicting content 
 *******************************************************/
public class TaskTracker 
             implements MRConstants, TaskUmbilicalProtocol, Runnable {
<<<<<<< HEAD
  
=======
  /**
   * @deprecated
   */
  @Deprecated
  static final String MAPRED_TASKTRACKER_VMEM_RESERVED_PROPERTY =
    "mapred.tasktracker.vmem.reserved";
  /**
   * @deprecated
   */
  @Deprecated
  static final String MAPRED_TASKTRACKER_PMEM_RESERVED_PROPERTY =
     "mapred.tasktracker.pmem.reserved";
 
>>>>>>> 0d4f44c00118954d66d06cb301fcb0189226b9fb
  static final long WAIT_FOR_DONE = 3 * 1000;
  private int httpPort;
Solution content 
 *******************************************************/
public class TaskTracker 
             implements MRConstants, TaskUmbilicalProtocol, Runnable {
  
  /**
   * @deprecated
   */
  @Deprecated
  static final String MAPRED_TASKTRACKER_VMEM_RESERVED_PROPERTY =
    "mapred.tasktracker.vmem.reserved";
  /**
   * @deprecated
   */
  @Deprecated
  static final String MAPRED_TASKTRACKER_PMEM_RESERVED_PROPERTY =
     "mapred.tasktracker.pmem.reserved";
 
  static final long WAIT_FOR_DONE = 3 * 1000;
  private int httpPort;
File
TaskTracker.java
Developer's decision
Version 2
Kind of conflict
Annotation
Attribute
Comment