Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
commit3a2e46ae1de4f45b88211306a2b6c0c5efd368ab
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 13 Mar 2018 18:29:28 +0000 (13 18:29 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 13 Mar 2018 18:29:28 +0000 (13 18:29 +0000)
treeafe05674b79aa39807a56a1336741e8f2925729e
parent026aaf47c02b79036feb830206cfebb2a726510d
parent44acd46f60ce6f16d369cd443e77949deca56a2c
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging

# gpg: Signature made Tue 13 Mar 2018 12:28:21 GMT
# 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: include original filename when reporting invalid URIs

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>