On Mon, Feb 16, 2015 at 05:31:06PM +0100, Petr Pudlák wrote: > On Mon, Feb 16, 2015 at 5:30 PM, Petr Pudlák <[email protected]> wrote: > > > LGTM > > > > On Mon, Feb 16, 2015 at 5:27 PM, 'Klaus Aehlig' via ganeti-devel < > > [email protected]> wrote: > > > >> > >> commit 28b8da6bd54e67bf308d3158ff1701982932b449 > >> Merge: c1f3366 1ab5e9f > >> Author: Klaus Aehlig <[email protected]> > >> Date: Mon Feb 16 17:25:45 2015 +0100 > >> > >> Merge branch 'stable-2.10' into stable-2.11 > >> > >> * stable-2.10 > >> Fix haddock comment > >> > >> * stable-2.11 > >> Fix file descriptor leak in Confd Client > >> Fix hlint warnings found by hlint 1.9.11 > >> > > > I overlooked something, shouldn't this have been stable-2.9?
Yes, you're right. Changed the patch as follow. commit 7596418507710c31a1d74dfff62c6eee0b922481 Merge: c1f3366 1ab5e9f Author: Klaus Aehlig <[email protected]> Date: Mon Feb 16 17:25:45 2015 +0100 Merge branch 'stable-2.10' into stable-2.11 * stable-2.10 Fix haddock comment * stable-2.9 Fix file descriptor leak in Confd Client Fix hlint warnings found by hlint 1.9.11 Signed-off-by: Klaus Aehlig <[email protected]> -- 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
