summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-04-06 17:51:20 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-04-06 17:51:21 +0100
commit08e173f29461396575c85510eb41474b993cb1fb (patch)
treeb4acff2b6b9296d138b9388774af21c7cbbe9a14 /contrib
parentd7fa7fb504bcf2a0a8d7a83b5d3c6cfe4ea07d31 (diff)
parent057ad0b46992e3ec4ce29b9103162aa3c683f347 (diff)
downloadqemu-08e173f29461396575c85510eb41474b993cb1fb.tar.gz
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 <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>
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions