On 09/15/2016 08:42 AM, Archana Singh wrote:
Hi Aline,
I am able to apply both patches to next branch.
* s d58c089 [origin/next] Introducing s390x UI
Interfaces module for Edit Guest under virtualization
remotes/origin/HEAD -> origin/master
remotes/origin/gh-pages 33b97bc Aug 31 meeting
remotes/origin/master 77ddaa6 remote iso listing for s390x
remotes/origin/next d58c089 Introducing s390x UI Interfaces
module for Edit Guest under virtualization
[archana@archanasingh kimchi]$ sudo git am
~/Documents/f_drive/tmp-delete/\[Kimchi-devel\]\ \[PATCH\ v2\]\
\[Kimchi\ 1_2\]\ added\ \'console\'\ parameter\ to\ templates\ api\
for\ s390x.eml
Applying: added 'console' parameter to templates api for s390x
[archana@archanasingh kimchi]$ sudo git am
~/Documents/f_drive/tmp-delete/\[Kimchi-devel\]\ \[PATCH\ v2\]\
\[Kimchi\ 2_2\]\ added\ \'console\'\ parameter\ to\ vms\ api\ for\
s390x.eml
Applying: added 'console' parameter to vms api for s390x
Thanks,
Archana
On 09/15/2016 03:08 AM, Aline Manera wrote:
> Hi Suresh,
>
> I was not able to apply those patches on top of next branch.
>
> Could you rebase and resend, please?
>
> Regards,
> Aline Manera
Hello Aline and Archana,
I have sent v3 patch as v2 doesn't apply on next branch because of
conflict in i18n.py.
>
> On 09/13/2016 04:59 AM, sureshab(a)linux.vnet.ibm.com wrote:
>> From: Suresh Babu Angadi <sureshab(a)in.ibm.com>
>>
>> v1-v2: provided detailed commit message and reduced number of patches
>>
>> In case of s390x architecture, console type can be
>> either virtio/sclp. Extended current code to support
>> console configuration in case of s390x
>>
>> this patch set provides option to configure 'console'
>> parameter for templates and vms api when running on
>> 's390x' architecture
>>
>>
>> Suresh Babu Angadi (2):
>> added 'console' parameter to templates api for s390x
>> added 'console' parameter to vms api for s390x
>>
>> API.json | 24 ++++++++++++++---
>> control/templates.py | 1 +
>> i18n.py | 4 +++
>> model/templates.py | 6 +++++
>> model/vms.py | 75
>> +++++++++++++++++++++++++++++++++++-----------------
>> osinfo.py | 4 +++
>> xmlutils/serial.py | 5 +++-
>> 7 files changed, 91 insertions(+), 28 deletions(-)
>>
>
> _______________________________________________
> Kimchi-devel mailing list
> Kimchi-devel(a)ovirt.org
>
http://lists.ovirt.org/mailman/listinfo/kimchi-devel
>
--
Regards,
Suresh Babu Angadi