To clarify, committers are the only ones who can approve and merge changes, to any of the maintained branches.
Any contributor can propose changes to any open branch, and a cherry-pick is just a proposed change that happens to be a (rebased) copy of another change. Chris. -----Original Message----- From: vpp-dev@lists.fd.io <vpp-dev@lists.fd.io> On Behalf Of Elias Rudberg Sent: Wednesday, July 15, 2020 07:29 To: ayour...@gmail.com Cc: vpp-dev@lists.fd.io; dwallac...@gmail.com Subject: [EXTERNAL] Re: [vpp-dev] VPP 20.05.1 tomorrow 15th July 2020 Hi Andrew, I don't know how to cherry-pick. I was under the impression that only the trusted commiters were allowed to do that, maybe I misunderstood that. What I know so far about the gerrit system is what I read here: https://urldefense.com/v3/__https://wiki.fd.io/view/VPP/Pulling,_Building,_Running,_Hacking_and_Pushing_VPP_Code*Pushing_Code_with_git_review__;Iw!!CQl3mcHX2A!SkOWdT8Z5B79TmRqn5_fL1LYof7mqilJRpdNLporTGsXh43TVyfj4Bbx1Qvmpnk8Ag$ Is there a guide somewhere describing how to do cherry-picking? Alternatively, could you do it for me? / Elias On Wed, 2020-07-15 at 12:27 +0200, Andrew 👽 Yourtchenko wrote: > Hi Elias, sure, feel free to cherry-pick to stable/2005 branch and add > me as a reviewer, then I can merge when JJB gives thumbs up. > > --a > > > On 15 Jul 2020, at 07:25, Elias Rudberg <elias.rudb...@bahnhof.net> > > wrote: > > > > Hello Andrew, > > > > The following two fixes have been merged to the master branch, it > > would be good to have them in stable/2005 also: > > > > https://urldefense.com/v3/__https://gerrit.fd.io/r/c/vpp/*/27280__;K > > w!!CQl3mcHX2A!SkOWdT8Z5B79TmRqn5_fL1LYof7mqilJRpdNLporTGsXh43TVyfj4B > > bx1QuwGCsEhg$ (misc: ipfix-export unformat > > u16 > > collector_port fix) > > > > https://urldefense.com/v3/__https://gerrit.fd.io/r/c/vpp/*/27281__;K > > w!!CQl3mcHX2A!SkOWdT8Z5B79TmRqn5_fL1LYof7mqilJRpdNLporTGsXh43TVyfj4B > > bx1QufJvaKPw$ (nat: fix regarding vm arg for vlib_time_now call) > > > > Best regards, > > Elias > > > > > > > On Tue, 2020-07-14 at 19:04 +0200, Andrew Yourtchenko wrote: > > > 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 > > > -=-=-=-=-=-=-=-=-=-=-=- > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#16972): https://lists.fd.io/g/vpp-dev/message/16972 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] -=-=-=-=-=-=-=-=-=-=-=-
