LGTM, thanks. On Thu, Jan 22, 2015 at 6:10 PM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> > commit 1be803be4792a5d395079e8722b87c6621fc2f9e > Merge: 0f4d6de 85993fb > Author: Klaus Aehlig <[email protected]> > Date: Thu Jan 22 18:07:06 2015 +0100 > > Merge branch 'stable-2.11' into stable-2.12 > > * 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 > > 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 >
