commit 04cf6708544736628302b5b5a807de19e1a7d34d
Merge: 8e4b725 712ea2f
Author: Klaus Aehlig <[email protected]>
Date: Mon Feb 29 18:12:33 2016 +0100
Merge branch 'stable-2.14' into stable-2.15
* stable-2.14
Support userspace disk URIs for OS import/export scripts
iallocator: only adjust memory usage for up instances
Signed-off-by: Klaus Aehlig <[email protected]>
--
Klaus Aehlig
Google Germany GmbH, Erika-Mann-Str. 33, 80636 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Matthew Scott Sucherman, Paul Terence Manicle
