[Kimchi-devel] [PATCH 0/4] implement reset API

[Aline Manera]

On 04/11/2014 12:30 PM, Sheldon wrote:
> On 04/11/2014 09:53 AM, Aline Manera wrote:
>>
>> I can't apply this patch set.
>> Does it depend on other patch set?
> sorry.
> it depends on [PATCH 0/3] bug fix: change power off to stop for VM and 
> add a power off confirmation.
>
> and now the depend patch is merged.
>
> you can apply this patch again.

I've just tried to apply again and it fails

alinefm at alinefm:~/kimchi$ git am -3 ../mail-patches/\[Kimchi-devel\]\ 
\[PATCH\ *
Applying: reset VM: update API.md
Applying: reset VM in backend.
fatal: sha1 information is lacking or useless (src/kimchi/i18n.py).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0002 reset VM in backend.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

Maybe some conflict to the recent merged patches.
Please, rebase and re-send the patches

>
>>
>> On 04/10/2014 10:04 AM, shaohef at linux.vnet.ibm.com wrote:
>>> From: ShaoHe Feng <shaohef at linux.vnet.ibm.com>
>>>
>>> Reset VM emulates the power reset button on a machine.
>>> There is a risk of data loss caused by reset without the guest OS 
>>> shutdown.
>>>
>>> Also add a reset confirmation in UI.
>>>
>>> ShaoHe Feng (4):
>>> reset VM: update API.md
>>> reset VM in backend.
>>> reset vm in UI
>>> add confirmation for reset a VM
>>>
>>> docs/API.md | 3 +++
>>> src/kimchi/control/vms.py | 1 +
>>> src/kimchi/i18n.py | 1 +
>>> src/kimchi/mockmodel.py | 3 +++
>>> src/kimchi/model/vms.py | 8 ++++++++
>>> ui/js/src/kimchi.api.js | 13 ++-----------
>>> ui/js/src/kimchi.guest_main.js | 21 +++++++++++++++------
>>> ui/pages/i18n.html.tmpl | 3 +++
>>> 8 files changed, 36 insertions(+), 17 deletions(-)
>>>
>>
>>
>>
>
>