> * stable-2.12 > [...] > Allow unconditional failovers off offline nodes > [...] > > Conflicts: > [...] > src/Ganeti/HTools/Cluster.hs - remove applyMoveEx, which was > moved to Ganeti.HTools.Cluster.Moves
Seriously?? Just because code moved does not mean you can simply drop the fixes made to this code in the merge. We want issue 951 fixed on all branches, not just 2.14 and lower. I'll send a patch to repair this. -- Klaus Aehlig Google Germany GmbH, Dienerstr. 12, 80331 Muenchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
