[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH] hmp-commands.hx: fix badly merged client_migrat
From: |
Jes Sorensen |
Subject: |
[Qemu-devel] Re: [PATCH] hmp-commands.hx: fix badly merged client_migrate_info command |
Date: |
Fri, 11 Mar 2011 07:33:17 +0100 |
User-agent: |
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101209 Fedora/3.1.7-0.35.b3pre.fc14 Thunderbird/3.1.7 |
On 03/11/11 00:21, Anthony Liguori wrote:
> On 03/09/2011 09:54 AM, address@hidden wrote:
>> From: Jes Sorensen<address@hidden>
>>
>> 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.
I wasn't quite sure where the badness happened, it basically looked like
a bad cleanup after a git pull. Sorry if I gave the impression that the
merge at your end was to blame.
Cheers,
Jes