Hi Chinmaya, The custom practice is for the initiator of the commit to cherry-pick into the branches necessary, so the potential merge resolution is done by the SME.
In this case it has cherry-picked cleanly - so if it passes the tests I will merge it into stable/2005 so as to have it in the dot-release. --a On 7/14/20, Chinmaya Aggarwal <chinmaya.agar...@hsc.com> wrote: > Hi, > Code for change id 27656 has been merged in master branch. This can be > merged in stable/2005 > > Get Outlook for Android<https://aka.ms/ghei36> > ________________________________ > From: vpp-dev@lists.fd.io <vpp-dev@lists.fd.io> on behalf of Andrew > Yourtchenko via lists.fd.io <ayourtch=gmail....@lists.fd.io> > Sent: Tuesday, July 14, 2020 10:34:02 PM > To: vpp-dev <vpp-dev@lists.fd.io> > Cc: Dave Wallace <dwallac...@gmail.com> > Subject: [vpp-dev] VPP 20.05.1 tomorrow 15th July 2020 > > CAUTION:This email originated from an external organization > > Hi all, > > As agreed on the VPP community call today, we will declare the current > stable/2005 branch as v20.05.1 tomorrow (15th July) > > If you have any fixes that are already in master but not yet in stable/2005, > that you want to get in there - please let me know before noon UTC. > > --a > Your friendly release manager > DISCLAIMER: This electronic message and all of its contents, contains > information which is privileged, confidential or otherwise protected from > disclosure. The information contained in this electronic mail transmission > is intended for use only by the individual or entity to which it is > addressed. If you are not the intended recipient or may have received this > electronic mail transmission in error, please notify the sender immediately > and delete / destroy all copies of this electronic mail transmission without > disclosing, copying, distributing, forwarding, printing or retaining any > part of it. Hughes Systique accepts no responsibility for loss or damage > arising from the use of the information transmitted by this email including > damage from virus. >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16961): https://lists.fd.io/g/vpp-dev/message/16961 Mute This Topic: https://lists.fd.io/mt/75503386/21656 Group Owner: vpp-dev+ow...@lists.fd.io Unsubscribe: https://lists.fd.io/g/vpp-dev/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
