Hi Christine, I cannot merge [1] because it has a merge conflict. Can you resolve the merge conflict and +2 the patch again?
Thanks, Thanh On Wed, Feb 20, 2019 at 5:08 AM <[email protected]> wrote: > Thanks Thanh for the correct way. This gerrit [1][2] has met the given > conditions. I don’t know which super committer is free to help, so I > currently invited you as reviewer, would you help it? Many thanks. > > > > [1] https://git.opendaylight.org/gerrit/#/c/80277/ > > [2] https://git.opendaylight.org/gerrit/#/c/80407/ (Jenkins build fail, > but Thanh commented that it’s fine in [3]. [2] is cherry-pick from [3]) > > [3] https://git.opendaylight.org/gerrit/#/c/77397/ > > > > Thank you > > Christine > > > > > > *From:* Thanh Ha [mailto:[email protected]] > *Sent:* Wednesday, February 20, 2019 12:50 AM > *To:* 謝宜玲 > *Cc:* Anil Belur; Luis Gomez Palacios; Ariel Adam; discuss; Release > *Subject:* Re: [release] [OpenDaylight Discuss] Can't do merge in > snmp4sdn stable/neon branch > > > > Hi Christine, > > > > What I would do is prepare your patch so that: > > > > * it passes Jenkins > > * has no merge conflicts > > * +2 the patch by a snmp4sdn committer > > > > Then any of the super committers [0] can submit the patch for you during > stable/neon code freeze. Because the way Gerrit blocks branches we cannot > unblock for only a single project so this is the best path. > > > > Reply here with a list of patches you'd like merged once the above > conditions are met and we can merge your patch for you. > > > > Hope this helps, > > Thanh > > > > [0] > https://docs.opendaylight.org/en/latest/release-process/super-committers.html#id1 > > > > On Mon, Feb 18, 2019 at 9:45 PM <[email protected]> wrote: > > Thanks Anil Luis. > > Is Adam the release manager? Would you help to unlock snmp4sdn stable/neon > branch, then I can add snmp4sdn to distribution repo. Thank you. > > > > Christine > > > > *From:* Anil Belur [mailto:[email protected]] > *Sent:* Tuesday, February 19, 2019 7:50 AM > *To:* Luis Gomez > *Cc:* 謝宜玲; OpenDaylight Discuss; Release > *Subject:* Re: [OpenDaylight Discuss] [release] Can't do merge in > snmp4sdn stable/neon branch > > > > > > > > On Tue, Feb 19, 2019 at 9:10 AM Luis Gomez <[email protected]> wrote: > > Hi Anil, AFAIR Self-Managed projects are not affected by milestones, so I > think it should be OK to open the branch. > > > > ah sorry, forgot snmp4sdn is SM project. > > > > - Anil > > > > -- > 本信件可能包含工研院機密資訊，非指定之收件者，請勿使用或揭露本信件內容，並請銷毀此信件。 This email may contain > confidential information. Please do not use or disclose it in any way and > delete it if you are not the intended recipient. > > _______________________________________________ > release mailing list > [email protected] > https://lists.opendaylight.org/mailman/listinfo/release > > > > -- > 本信件可能包含工研院機密資訊，非指定之收件者，請勿使用或揭露本信件內容，並請銷毀此信件。 This email may contain > confidential information. Please do not use or disclose it in any way and > delete it if you are not the intended recipient. >
_______________________________________________ Discuss mailing list [email protected] https://lists.opendaylight.org/mailman/listinfo/discuss
