]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 6 Apr 2018 16:51:20 +0000 (17:51 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 6 Apr 2018 16:51:21 +0000 (17:51 +0100)
# gpg: Signature made Fri 06 Apr 2018 14:29:10 BST
# gpg:                using RSA key BE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
# 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 <peter.maydell@linaro.org>

Trivial merge