commit | 4b5805de49edec5a81fe810bb612317de6545a38 | [log] [tgz] |
---|---|---|
author | Anthony Liguori <aliguori@us.ibm.com> | Mon Mar 25 13:14:20 2013 -0500 |
committer | Anthony Liguori <aliguori@us.ibm.com> | Mon Mar 25 13:14:20 2013 -0500 |
tree | d6ad52a98d23d3768ff8025938b08a8fc7d10673 | |
parent | d2f38a0acb0a1c5b7ab7621a32d603d08d513bea [diff] | |
parent | ea804cadf867a0521b9069193db339d041a40689 [diff] |
Merge remote-tracking branch 'stefanha/block' into staging # By Liu Yuan (1) and Stefan Weil (1) # Via Stefan Hajnoczi * stefanha/block: block: Add options QDict to bdrv_file_open() prototypes (fix MinGW build) rbd: fix compile error