[Merge] Merge branch 'stable-2.10' into stable-2.11

['Hrvoje Ribicic' via ganeti-devel]

commit b405097c64d8426ba9689904579070ae274a30f6
Merge: 0e5e0f3 f879621
Author: Hrvoje Ribicic <r...@google.com>
Date:   Thu Mar 19 13:53:40 2015 +0100

    Merge branch 'stable-2.10' into stable-2.11

    * stable-2.10
      Make QA fail if KVM hotplugging fails
      Always preserve QA command output
      Don't lose stdout/stderr in AssertCommand
      qa_utils: Allow passing fail=None to AssertCommand
      qa_utils: Make AssertCommand return stdout/stderr as well
      Allow plain/DRBD conversions regardless of lack of disks
      Add support for ipolicy modifications to mock config

    Signed-off-by: Hrvoje Ribicic <r...@google.com>

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