On Fri, Mar 7, 2014 at 6:40 PM, Klaus Aehlig <[email protected]> wrote: > > > commit 7f24360611a2287d2a52dd4d541058777cadae32 > Merge: 714022e ddc6458 > Author: Klaus Aehlig <[email protected]> > Date: Fri Mar 7 18:35:17 2014 +0100 > > Merge branch 'stable-2.9' into stable-2.10 > > * stable-2.9 > Fix error introduced during merge > gnt-cluster copyfile: accept relative paths > > * stable-2.8 > Improve RAPI detection of the watcher > Add patching QA configuration files on buildbots > Enable a timeout for instance shutdown > Allow KVM commands to have a timeout > Allow xen commands to have a timeout > Fix wrong docstring > > 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
LGTM, thanks. Michele -- 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
