On Wed, Apr 08, 2015 at 04:39:18PM +0200, Hrvoje Ribicic wrote: > On Wed, Apr 8, 2015 at 4:37 PM, 'Klaus Aehlig' via ganeti-devel < > [email protected]> wrote: > > > > > > > commit 343d53a31a9e438dae3ba53c8778fa50d0660286 > > 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: trivial > > lib/utils/storage.py: take stable-2.13 > > > > Didn't you just combine here? LGTM otherwise.
No. The change in the lower branch was to replace os.minor by utils.osminor; on the upper branch, the call to os.minor was removed at this place. So, there was nothing to combine. -- 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
