commit af0bc91e8f0b2765ded71bedb4443f1fe8e66c14
Merge: a56d29a 70f22ba
Author: Klaus Aehlig <[email protected]>
Date: Wed Apr 8 11:21:05 2015 +0200
Merge branch 'stable-2.10' into stable-2.11
* stable-2.10
fix typos in design-file-based-storage.rst doc
Switch to our osminor
Provide an alternative for os.minor working around its bug
Fix typo
CanTieredAlloc test: make instances big enough
After master-failover verify reachability of master IP
Report failure to deactivate old master IP in exit code
Expose warnings during master-failover
Fix manpage for gnt-cluster copyfile
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
