[openstack-dev] [nova][turbo hipster] unable to rebase

John Garbutt john at johngarbutt.com
Thu Jan 9 12:30:56 UTC 2014


On 8 January 2014 12:07, Gary Kotton <gkotton at vmware.com> wrote:
> Hi,
> Patch sets that are cascaded has have the following errors:
>
> "Database migration testing failed either due to migrations unable to be
> applied correctly or taking too long.
>
> This change was unable to be automatically merged with the current state of
> the repository. Please rebase your change and upload a new patch set."
>
> What do you suggest?

If you rebase you code, would that not fix everything?

It seems for the tests to pass, that change needs to be able to rebase
on trunk these days.

John



More information about the OpenStack-dev mailing list