[Qemu-devel] Re: [PATCH] hmp-commands.hx: fix badly merged client_migrate_info command

2011-03-10 Thread Anthony Liguori
On 03/09/2011 09:54 AM, jes.soren...@redhat.com wrote: From: Jes Sorensen client_migrate_info was merged badly, It wasn't merged badly, it was implemented badly. The initial description confused me because it sounded like a bad merge conflict resolution but it just was wrong from the start.

[Qemu-devel] Re: [PATCH] hmp-commands.hx: fix badly merged client_migrate_info command

2011-03-10 Thread Jes Sorensen
On 03/11/11 00:21, Anthony Liguori wrote: > On 03/09/2011 09:54 AM, jes.soren...@redhat.com wrote: >> From: Jes Sorensen >> >> client_migrate_info was merged badly, > > It wasn't merged badly, it was implemented badly. The initial > description confused me because it sounded like a bad merge conf