On Fri, Aug 07, 2015 at 07:06:02PM +0200, 'Petr Pudlak' via ganeti-devel wrote: > commit 1187da76f084d9a1d6c3823c4d3386a8820a6757 > Merge: 041247c 08c5120 > Author: Petr Pudlak <[email protected]> > Date: Fri Aug 7 18:49:51 2015 +0200 > > Merge branch 'stable-2.12' into stable-2.13 > > * stable-2.12 > Accept allocation of 0 jobs > Return multiple fields multiple times > In queries collect all needed data > Add a function computing the filter arguments > Utils: Add ordNub > Accept timeout errors are luxi down > > Conflicts: > src/Ganeti/Query/Query.hs - use the 2.12 version, just renaming > evaluateFilter to evaluateQueryFilter > src/Ganeti/Utils.hs - keep 2.13 version (from which ordBy has been > cherry picked)
LGTM -- 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
