-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Peter Maydell <peter.mayd...@linaro.org> writes:

> On 5 February 2016 at 16:27, Alex Bennée <alex.ben...@linaro.org> wrote:
>>
>> Alex Bennée <alex.ben...@linaro.org> 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?

I've pushed a signed tags/pull-build-test-20160205 but I'm still waiting
for the job to finish and I'm about to sign off. If your around for a
bit longer you can wait until:

https://travis-ci.org/stsquad/qemu/builds/107280297

goes green.

>
> thanks
> -- PMM


- --
Alex Bennée
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAEBAgAGBQJWtNvXAAoJEPvQ2wlanipEBesH/jKiJcv8qt+a4qJ8tq80UilF
rLbgOMnKxliUGQG7ITqOL2lIYrXex7J/6iO1/mdSPJ4GLy/6hoHzVzBdD0m/soV0
CwS3KSZiQLFc9M17WZ3NqpF/zGsKb0FNrr7zm1J72rgXtNmLiDLCpoVgJzfdxjtp
0KObW9OJSQ2AiG77G1awpdW6OEwn+YkOOtXpNYPFkpWouHr1Ryt99Sgpi6jnZmm1
0ksZwvyehIeR2+eqaFleSuafe9XWC5J+QRYixpINIsSVQOLLaRRBX5V+hbJORsDu
6D1t6NLLcZ7Lu/V7tG8HofNYDCGb+6mRbHTqJpmfxu4uP613LeSlAlws7Qqg5Yw=
=5f3f
-----END PGP SIGNATURE-----

Reply via email to