[Merge] lp:~corey.bryant/nova/2014.1.2 into lp:~ubuntu-server-dev/nova/icehouse

[Corey Bryant]

> > Can you resync the branch with what we have in the archive?
> 
> Ok, new branch has been pushed after resyncing.  The resync resulted in a new
> patch that hasn't been applied yet upstream.

The new patch is libvirt-convert-cpu-features-attribute-from-list-to-.patch
-- 
https://code.launchpad.net/~corey.bryant/nova/2014.1.2/+merge/230128
Your team Ubuntu Server Developers is subscribed to branch lp:~ubuntu-server-dev/nova/icehouse.