aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-05-08 17:05:58 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-05-08 17:05:58 +0100
commite5cd695266c5709308aa95b1baae499e4b5d4544 (patch)
treef51fe9e7dfa9e86b42dab4c14617dce7ca848b8a /MAINTAINERS
parentcc8f8ba754bba17eea9791d67b572eb26e30b4ce (diff)
parenta2cb9239b7610ffb00f9ced5cd7640d40b0e1ccf (diff)
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Tue 08 May 2018 16:18:22 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: sheepdog: Fix sd_co_create_opts() memory leaks iotests: Add test for cancelling a mirror job block/mirror: Make cancel always cancel pre-READY block/mirror: honor ratelimit again Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions