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

Michael Still mikal at stillhq.com
Fri Jan 10 01:41:22 UTC 2014


Sorry the slow response. I've been at a conference this week, so I'm a
bit behind. I apologise for that.

The root cause here is a failure to understand the relatively
undocumented git behaviour of zuul. We think we've now got a fix, and
will deploy it soon.


On Thu, Jan 9, 2014 at 8:30 PM, John Garbutt <john at johngarbutt.com> wrote:
> 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
> _______________________________________________
> OpenStack-dev mailing list
> OpenStack-dev at lists.openstack.org
> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev

Rackspace Australia

More information about the OpenStack-dev mailing list