OpenStack Compute (nova)

Code review comment for lp:~ewanmellor/nova/xenapi-concurrency-model

  1. xenapi-concurrency-model
  2. Merge into trunk
Revision history for this message
Ewan Mellor (ewanmellor) wrote :

I've remerged this with trunk. The style cleanups that went in today caused
inevitable conflicts.

Ewan.

On Tue, Aug 17, 2010 at 10:33:45PM +0100, OpenStack Hudson wrote:

> Attempt to merge lp:~ewanmellor/nova/xenapi-concurrency-model into lp:nova failed due to merge conflicts:
>
> text conflict in nova/virt/xenapi.py
> --
> https://code.launchpad.net/~ewanmellor/nova/xenapi-concurrency-model/+merge/32722
> You are the owner of lp:~ewanmellor/nova/xenapi-concurrency-model.

« Back to merge proposal