commit | 4dd533aa03d6844f61e95558d75d8dbec72d899c | [log] [tgz] |
---|---|---|
author | Anthony Liguori <aliguori@us.ibm.com> | Mon Jul 30 09:59:38 2012 -0500 |
committer | Anthony Liguori <aliguori@us.ibm.com> | Mon Jul 30 09:59:38 2012 -0500 |
tree | 18dbd2b12fe1375f3396a0f47b822b2439271724 | |
parent | d4a06f466ac476fedc927c8355c6a3e0a1c6ca42 [diff] | |
parent | 39a5235cd7f367cce7be7b3f4d258452452e38e3 [diff] |
Merge remote-tracking branch 'bonzini/nbd-next' into staging * bonzini/nbd-next: qemu-nbd: add --cache and --aio options qemu-nbd: reorganize help message