On Fri, Jul 04, 2014 at 04:01:43PM +0200, 'Petr Pudlak' via ganeti-devel wrote: > commit 794e8be1ca49bb5ee4f808de344522d022ad2cab > Merge: 011da40 1003d92 > Author: Petr Pudlak <[email protected]> > Date: Fri Jul 4 15:52:46 2014 +0200 > > Merge branch 'stable-2.9' into stable-2.10 > > * stable-2.9 > Move the design for query splitting to the implemented list > > Conflicts: > doc/design-draft.rst > Resolution: > Fix the missing .rst extension in 2.10.
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
