On 09/07/2015 12:39, Loic Dachary wrote: > Dear co-backporters, > > For the first time we have a few conflicting pull requests that prevent > merging all in the integration branch. > > https://github.com/ceph/ceph/pull/4597 > https://github.com/ceph/ceph/pull/5043 > https://github.com/ceph/ceph/pull/4788 > https://github.com/ceph/ceph/pull/4636 > https://github.com/ceph/ceph/pull/4635
I'll merge https://github.com/ceph/ceph/pull/4636 https://github.com/ceph/ceph/pull/4635 https://github.com/ceph/ceph/pull/4597 and keep the other two as DNM for later then. > > I think the simplest way to deal with that is to arbitrarily pick a few that > apply cleanly and just DNM the others so they wait for the next round of > integration testing. After the first round of integration test, the chosen > one will be merged and the DNM will have to be rebased to resolve the > conflict, but that's what we do routinely. > > What do you think ? > -- Loïc Dachary, Artisan Logiciel Libre
signature.asc
Description: OpenPGP digital signature
