LGTM, thanks! On Fri, Jan 23, 2015 at 12:12 PM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> > commit b56b29ce6ac829f879e04342604a5a827d6f1bea > Merge: 16048b0 bae89b8 > Author: Klaus Aehlig <[email protected]> > Date: Fri Jan 23 12:08:54 2015 +0100 > > Merge branch 'stable-2.12' into stable-2.13 > > * 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 > Fix spacing > Ingore automatically generated tools/shebang > Auto-upgrade hv_state_static and disk_state_static > > Conflicts: > .gitignore: use both additions > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc .gitignore > index b3e4cad,5e7756a..d1b927a > --- a/.gitignore > +++ b/.gitignore > @@@ -128,7 -128,7 +128,8 @@@ > /tools/node-cleanup > /tools/node-daemon-setup > /tools/prepare-node-join > + /tools/shebang/ > +/tools/ssh-update > > # scripts > /scripts/gnt-backup > > -- > 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
