LGTM, thanks On Mon, Jan 26, 2015 at 2:48 PM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> > commit 16598da1b8a4d47f832c77c67f33d519968e6b56 > Merge: 01286cd 15e88f9 > Author: Klaus Aehlig <[email protected]> > Date: Mon Jan 26 14:44:11 2015 +0100 > > Merge branch 'stable-2.13' into stable-2.14 > > * stable-2.13 > Fix haddock comments > > * stable-2.12 > When starting the MetaD, clean up its UDP socket > Put the MetaD socket name into the Path module > > * stable-2.11 > Handle missing 'restart_when' in watcher's state file > Gluster: fix mount.glusterfs argument passing > > * stable-2.10 > Ingore automatically generated tools/shebang > Auto-upgrade hv_state_static and disk_state_static > > 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 > Hrvoje Ribicic Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
