]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-09-04' into queue...
authorKevin Wolf <kwolf@redhat.com>
Fri, 4 Sep 2015 19:43:40 +0000 (21:43 +0200)
committerKevin Wolf <kwolf@redhat.com>
Fri, 4 Sep 2015 19:43:55 +0000 (21:43 +0200)
commitc804b5791d51608c0e12e4cc2b40b3d763ce796c
treecb92ccf3ac78e8fbc4599aedca2f5aa1b07d2576
parent2ef6093cd6990314304f2d3b18eb476ee418d73c
parent834cb2ada5db197a11c99142d50222945d196fc0
Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-09-04' into queue-block

Block patches from 2015-08-24 until 2015-09-04.

# gpg: Signature made Fri Sep  4 21:02:10 2015 CEST using RSA key ID E838ACAD
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"

* mreitz/tags/pull-block-for-kevin-2015-09-04:
  quorum: validate vote threshold against num_children even if read-pattern is fifo
  qcow2: reorder fields in Qcow2CachedTable to reduce padding
  docs: document how to configure the qcow2 L2/refcount caches
  qcow2: add option to clean unused cache entries after some time
  qcow2: mark the memory as no longer needed after qcow2_cache_empty()

Signed-off-by: Kevin Wolf <kwolf@redhat.com>