diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-10-03 12:43:03 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-10-03 12:43:03 +0100 |
| commit | be9d199751789fdc96a3febe3f0768f1338d87ca (patch) | |
| tree | 171e1c4d8583033ec3d9745f7f405a51f44f259a /include/sysemu/watchdog.h | |
| parent | ab161529261928ae7f3556e3220829c34b2686ec (diff) | |
| parent | 36ac78e65a0695f0e397865cceaf4ab5c4e52c64 (diff) | |
| download | qemu-be9d199751789fdc96a3febe3f0768f1338d87ca.zip qemu-be9d199751789fdc96a3febe3f0768f1338d87ca.tar.gz qemu-be9d199751789fdc96a3febe3f0768f1338d87ca.tar.bz2 | |
Merge remote-tracking branch 'remotes/famz/tags/docker-testing-pull-request' into staging
# gpg: Signature made Fri 29 Sep 2017 04:17:37 BST
# gpg: using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6
* remotes/famz/tags/docker-testing-pull-request:
docker: Don't mount ccache db if NOUSER=1
docker: test-block: Don't continue if build fails
tests/docker/run: don't source /etc/profile
docker: Fix test-mingw
docker: add installation to build tests
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/sysemu/watchdog.h')
0 files changed, 0 insertions, 0 deletions