Re: [vpp-dev] https://gerrit.fd.io/r/8156 missing from master

2017-08-28 Thread Dave Wallace
On 08/28/2017 12:05 PM, Andrew Yourtchenko wrote: Dave, On 28 Aug 2017, at 17:32, Dave Wallace > wrote: Andrew, Having got some feedback from others, I don't think there is any one right way. For bugs found in a stable branch, it makes sense to push the origi

Re: [vpp-dev] https://gerrit.fd.io/r/8156 missing from master

2017-08-28 Thread Andrew Yourtchenko
Dave, > On 28 Aug 2017, at 17:32, Dave Wallace wrote: > > Andrew, > > Having got some feedback from others, I don't think there is any one right > way. > > For bugs found in a stable branch, it makes sense to push the original patch > there, then cherry pick to master and then identify if

Re: [vpp-dev] https://gerrit.fd.io/r/8156 missing from master

2017-08-28 Thread Dave Wallace
Andrew, Having got some feedback from others, I don't think there is any one right way. For bugs found in a stable branch, it makes sense to push the original patch there, then cherry pick to master and then identify if it makes sense to cherry pick it to any other branches. For bugs found

Re: [vpp-dev] https://gerrit.fd.io/r/8156 missing from master

2017-08-25 Thread Andrew Yourtchenko
Dave, Oh, I think during the "release" time we did the opposite. I was basing the logic on the sensible origin of the work on the code: the issue found on stable/1707, so I first verify the fix with the finder in their lab, thus ensuring they test just that change, and then commit and then cher

Re: [vpp-dev] https://gerrit.fd.io/r/8156 missing from master

2017-08-25 Thread Dave Wallace
Andrew, IMHO, best practice is to always commit to master first, then cherry pick to stable branches as required.  That being said, I'm not sure if this has been explicitly agreed upon by the VPP community. Thanks, -daw- On 8/25/17 3:38 AM, Andrew Yourtchenko wrote: Dave, Yeah, those thing

Re: [vpp-dev] https://gerrit.fd.io/r/8156 missing from master

2017-08-25 Thread Andrew Yourtchenko
Dave, Yeah, those things are found throughout testing of stable/1707 with various control planes (openstack etc), so I first deal with them in stable/1707 and after the commit id is there, cherry pick into master (so i made https://gerrit.fd.io/r/#/c/8207/ for master now). Those are few things

[vpp-dev] https://gerrit.fd.io/r/8156 missing from master

2017-08-24 Thread Dave Wallace
Andrew, I just merged https://gerrit.fd.io/r/8156 into stable/1707 and afterwards realized that it has not been committed to master. Shouldn't this be included in master as well? Same thing with https://gerrit.fd.io/r/#/c/8147/ -- is there a reason this is not being committed to master, then