> > Conflicts: > > lib/storage/bdev.py: trivial > > lib/utils/storage.py: take stable-2.13 > > > > Didn't you just combine here? LGTM otherwise.
Oh, now I see what you mean. I ammended the comment to now read as follows. commit 616ccf19fd6fc9f1b4911984cd5c42cc13d46438 Merge: 6af5421 5e68cc5 Author: Klaus Aehlig <[email protected]> Date: Wed Apr 8 16:26:01 2015 +0200 Merge branch 'stable-2.12' into stable-2.13 * stable-2.12 Fix typos * stable-2.11 (no changes) * 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 Conflicts: lib/storage/bdev.py: take stable-2.13 lib/utils/storage.py: trivial 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
