Re: [Services] [Ops] [Incident Report] Master Merged In WMF Branch

2018-03-07 Thread Antoine Musso
On 06/03/2018 19:44, Marko Obrovac wrote: > Hello, > > Today during the scheduled deploy window of moving JobQueue jobs from > the Redis-based infrastructure to the new EventBus-based one, a > combination of PEBKAC and Gerrit trying to be smart caused an accidental > merge of the mw core's master

Re: [Services] [Ops] [Incident Report] Master Merged In WMF Branch

2018-03-07 Thread Chad Horohoe
On Wed, Mar 7, 2018 at 2:25 AM Antoine Musso wrote: > Implicit merging of a branch into another might be helpful sometime, but > most probably all typical use cases would be due to a mistake and could > lead to a catastrophe. Indeed. Surprising this hasn't hit us hard before. To further on "thi

Re: [Services] [Ops] [Incident Report] Master Merged In WMF Branch

2018-03-07 Thread Stas Malyshev
Hi! > In their defense, the way they view the review/merge model is that > you target the lowest necessary supported branch for fixes and new > features land in master. Lower branches are routinely merged upwards. My experience has been this usually happens in older projects where most changes is