diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-09 14:21:20 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-09 14:21:20 +0000 |
| commit | 2f71f79ccd37ffdb857f043025eccb1c9c23401c (patch) | |
| tree | e694bd2cba8cd23cb6123590f59579cd3e11e8c2 /include/qapi | |
| parent | ac1be2ae6b2995b99430c48329eb971b0281acf1 (diff) | |
| parent | b9e02c061b74cf99fa4865381f85559bcdb09103 (diff) | |
| download | qemu-2f71f79ccd37ffdb857f043025eccb1c9c23401c.tar.gz qemu-2f71f79ccd37ffdb857f043025eccb1c9c23401c.tar.bz2 qemu-2f71f79ccd37ffdb857f043025eccb1c9c23401c.zip | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-build-test-20160209' into staging
This is the third attempt for this pull request.
Since the v4 was posted:
- fixed merge conflict with ed7f5f1d8db06fc31352a5ef4f54985e630c575a
- added cleaner separation line to MAINTAINERS at Fam's request
- skip "make check" for --enable-trace-backends=simple (see 41fc57e44ed)
# gpg: Signature made Tue 09 Feb 2016 12:33:45 GMT using RSA key ID 5A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>"
* remotes/stsquad/tags/pull-build-test-20160209:
MAINTAINERS: Add .travis.yml
.travis.yml: reduce the test matrix a little
.travis.yml: enable ccache for the builds
.travis.yml: enable each of the co-routine backends
.travis.yml: run make check for all matrix targets
.travis.yml: migrate to container builds
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qapi')
0 files changed, 0 insertions, 0 deletions