LGTM, thanks
On Thu, Aug 21, 2014 at 4:08 PM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote: > > commit 5b4b996b348e740e10a17e0557a28f9e12391885 > Merge: 8f6bb1c fa5f77e > Author: Klaus Aehlig <[email protected]> > Date: Thu Aug 21 15:52:39 2014 +0200 > > Merge branch 'stable-2.12' into master > > * stable-2.12 > Fix alterContainerL > Suffix bump for 2.12.0~rc1 > Prepare NEWS file for 2.12.0~rc1 > Relax cleanliness condition to allow the empty tree > Add Debian 'testing' to the schroot build script > Update the installation instructions > Fix the Attoparsec import in THH.hs > Re-read an instance object after starting its disks > Allow replace-disks to work on offline instances > Verify clean DATA_DIR on cluster init > > * stable-2.11 > (no changes) > > * stable-2.10 > Fix network info in case of multi NIC instances > > Conflicts: > configure.ac: ignore suffix bump > devel/build_chroot: use testing role to describe jessie > > 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 >
