From: Peter Maydell Date: Fri, 6 Apr 2018 16:51:20 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-pull-request' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=08e173f29461396575c85510eb41474b993cb1fb;p=qemu.git Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-pull-request' into staging # gpg: Signature made Fri 06 Apr 2018 14:29:10 BST # gpg: using RSA key BE86EBB415104FDF # gpg: Good signature from "Daniel P. Berrange " # gpg: aka "Daniel P. Berrange " # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF * remotes/berrange/tags/qcrypto-next-pull-request: crypto: ensure we use a predictable TLS priority setting docs: Document -object tls-creds-x509 priority=xxx docs: update information for TLS certificate management Signed-off-by: Peter Maydell --- 08e173f29461396575c85510eb41474b993cb1fb