Merge remote-tracking branch 'mreitz/block' into queue-block
authorKevin Wolf <kwolf@redhat.com>
Fri, 23 Jan 2015 17:51:47 +0000 (18:51 +0100)
committerKevin Wolf <kwolf@redhat.com>
Fri, 23 Jan 2015 17:51:47 +0000 (18:51 +0100)
* mreitz/block:
  iotests: Lower 064's memory usage
  block: vhdx - force FileOffsetMB field to '0' for certain block states


Trivial merge