| commit | f1a639aaf2748ad3f804c4d862f570ec6473da79 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Wed, 4 Apr 2018 16:48:18 +0000 (4 17:48 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Wed, 4 Apr 2018 16:48:18 +0000 (4 17:48 +0100) | ||
| tree | 80af4248e0c1097dc508308db9f5e19716804162 | treesnapshot (tar.gz zip) |
| parent | 74912f6dad207bfdd5bfa8c6012c364ea9405fc7 | commitdiff |
| parent | bfb15b4becf2c9cf484bc3bf893a37c8f3c15cb3 | commitdiff |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Wed 04 Apr 2018 17:07:57 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/rbd: remove processed options from qdict
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# gpg: Signature made Wed 04 Apr 2018 17:07:57 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/rbd: remove processed options from qdict
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>