[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 0/6] Travis updates
|
From: |
Alex Bennée |
|
Subject: |
Re: [Qemu-devel] [PULL 0/6] Travis updates |
|
Date: |
Fri, 05 Feb 2016 16:42:39 +0000 |
|
User-agent: |
mu4e 0.9.17; emacs 25.0.90.1 |
Peter Maydell <address@hidden> writes:
> On 5 February 2016 at 16:27, Alex Bennée <address@hidden> wrote:
>>
>> Alex Bennée <address@hidden> writes:
>>
>>> The following changes since commit 357e81c7e880f868833edf9f53cce1f3b09ea8ec:
>>>
>>> Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160128' into
>>> staging (2016-01-28 11:46:34 +0000)
>>>
>>> are available in the git repository at:
>>>
>>> https://github.com/stsquad/qemu.git tags/pull-build-test-20160204
>>
>> I had a momentary panic when I saw the email messages still had ---
>> history on them but the tag is clean and can be pulled.
>
> Merge conflict in .travis.yml -- probably easy enough to fix up but
> since I don't know anything about the travis syntax or how to test it,
> could you rebase and fix up the conflict, please?
Sneaky Paolo and Stefan getting their changes in before there is a
maintainer ;-)
I'll fix it up and address Fam's comment while I'm at it.
>
> thanks
> -- PMM
--
Alex Bennée