| commit | 8a26d88507b51b7cc5dc40732e51ccc135fec0f6 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 27 Jan 2017 14:08:57 +0000 (27 14:08 +0000) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Fri, 27 Jan 2017 14:08:57 +0000 (27 14:08 +0000) | ||
| tree | 9f6e2fb3f061592e7c1b2de4c135ec1ddbfde589 | treesnapshot (tar.gz zip) |
| parent | e14c2ffd541153a0c851b2163fc6f75587d9f176 | commitdiff |
| parent | 80fb34eda099e7cc519a91e9701ab3c0262717b3 | commitdiff |
Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2017-01-26-1' into staging
Merge io/ 2017/01/26
# gpg: Signature made Thu 26 Jan 2017 10:26:48 GMT
# gpg: using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/pull-qio-2017-01-26-1:
io: fix possible double free of task error object
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Merge io/ 2017/01/26
# gpg: Signature made Thu 26 Jan 2017 10:26:48 GMT
# gpg: using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/pull-qio-2017-01-26-1:
io: fix possible double free of task error object
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>