Projects information

Chunk

Conflicting content
} /** <<<<<<< HEAD * Creates a candidate that can be used to offer leadership for the given {@code group} using * a judge that always picks the lowest numbered candidate ephemeral node - by proxy the oldest * or 1st. The dataSupplier is the source of the data that will be stored in the leader-znode * and which is available to all participants via the getLeaderData method. ======= * Creates a candidate that can be used to offer leadership for the given {@code group} using a judge that * always picks the lowest numbered candidate ephemeral node - by proxy the oldest or 1st. The dataSupplier is the * source of the data that will be stored in the leader-znode and which is available to all participants via the * getLeaderData method. >>>>>>> 6f22aded4fbfcc163d8e2b7d54a13606f9470159 */ public CandidateImpl(Group group, Supplier dataSupplier) { this(group, MOST_RECENT_JUDGE, dataSupplier);

Conflicting content

  }

  /**
<<<<<<< HEAD
   * Creates a candidate that can be used to offer leadership for the given {@code group} using
   * a judge that always picks the lowest numbered candidate ephemeral node - by proxy the oldest
   * or 1st. The dataSupplier is the source of the data that will be stored in the leader-znode
   * and which is available to all participants via the getLeaderData method.
=======
   * Creates a candidate that can be used to offer leadership for the given {@code group} using a judge that
   * always picks the lowest numbered candidate ephemeral node - by proxy the oldest or 1st. The dataSupplier is the
   * source of the data that will be stored in the leader-znode and which is available to all participants via the
   * getLeaderData method.
>>>>>>> 6f22aded4fbfcc163d8e2b7d54a13606f9470159
   */
  public CandidateImpl(Group group, Supplier dataSupplier) {
    this(group, MOST_RECENT_JUDGE, dataSupplier);

Solution content
} /** * Creates a candidate that can be used to offer leadership for the given {@code group} using * a judge that always picks the lowest numbered candidate ephemeral node - by proxy the oldest * or 1st. The dataSupplier is the source of the data that will be stored in the leader-znode * and which is available to all participants via the getLeaderData method. */ public CandidateImpl(Group group, Supplier dataSupplier) { this(group, MOST_RECENT_JUDGE, dataSupplier);

Solution content

  }

  /**
   * Creates a candidate that can be used to offer leadership for the given {@code group} using
   * a judge that always picks the lowest numbered candidate ephemeral node - by proxy the oldest
   * or 1st. The dataSupplier is the source of the data that will be stored in the leader-znode
   * and which is available to all participants via the getLeaderData method.
   */
  public CandidateImpl(Group group, Supplier dataSupplier) {
    this(group, MOST_RECENT_JUDGE, dataSupplier);

File
CandidateImpl.java

Developer's decision
Version 1

Kind of conflict
Comment

Projects >> commons >>91589673797f54f280c7b93f3384dda2b5e42cd2