| commit | 666b0e732f694c995797e2a31ba19138ce4f69eb | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 14 Jun 2018 12:16:20 +0000 (14 13:16 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 14 Jun 2018 12:16:20 +0000 (14 13:16 +0100) | ||
| tree | e9b1cbcd58800abf7a9a40f6420f2f90b795b0b2 | treesnapshot (tar.gz zip) |
| parent | 945741da77d6d98e9323851787f258072bcb4c4a | commitdiff |
| parent | b61acdecbf19c3c5a327baec1e8e4c06d0da68b7 | commitdiff |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Wed 13 Jun 2018 15:52:27 BST
# gpg: using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
block: Ignore generated job QAPI files
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# gpg: Signature made Wed 13 Jun 2018 15:52:27 BST
# gpg: using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
block: Ignore generated job QAPI files
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>