On Tue, Aug 11, 2015 at 09:18:23 +0100, Daniel Berrange wrote:
On Mon, Aug 10, 2015 at 12:49:55PM -0600, Jim Fehlig wrote:
> This reverts commit 1ce7c1d20cfd5afb26d2dbc88201085d52415d0e,
> which introduced a significant semantic change to the
> virDomainGetInfo() API. Additionally, the change was only
> made to 2 of the 15 virt drivers.
>
> Conflicts:
> src/qemu/qemu_driver.c
>
> Signed-off-by: Jim Fehlig <jfehlig(a)suse.com>
> ---
> src/lxc/lxc_driver.c | 2 +-
> src/qemu/qemu_driver.c | 12 ++++++------
> 2 files changed, 7 insertions(+), 7 deletions(-)
ACK
I guess we should probably do this in the stable branch too, since I
think it made it into the most recent release.
Erm, the change is out for a while now:
git desc 1ce7c1d20cfd5afb26d2dbc88201085d52415d0e
v1.2.6-225-g1ce7c1d
Peter