aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-08-09 13:32:56 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-08-09 13:32:56 -0700
commitff9bafee7cdd295bc5e79252a5f2ca6f8bf3c1fe (patch)
tree1d07b4733d48f9c7961efe4f94c045688c05be23
parent09df9690ae7fc4cb39101621916d74979b45a8a6 (diff)
parente683dee37f89806fe1aa5b2050c0743593a4e11b (diff)
downloadcryptography-ff9bafee7cdd295bc5e79252a5f2ca6f8bf3c1fe.tar.gz
cryptography-ff9bafee7cdd295bc5e79252a5f2ca6f8bf3c1fe.tar.bz2
cryptography-ff9bafee7cdd295bc5e79252a5f2ca6f8bf3c1fe.zip
Merge pull request #1297 from reaperhulk/update-openssl
add OpenSSL from RHEL/CentOS 7 to testing list
-rw-r--r--docs/installation.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/installation.rst b/docs/installation.rst
index 6b8bb219..76f0439a 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -28,6 +28,7 @@ OpenSSL releases:
* ``OpenSSL 0.9.8y``
* ``OpenSSL 1.0.0-fips`` (``RHEL/CentOS 6.4``)
* ``OpenSSL 1.0.1``
+* ``OpenSSL 1.0.1e-fips`` (``RHEL/CentOS 7``)
* ``OpenSSL 1.0.1e-freebsd``
* ``OpenSSL 1.0.1h``
* ``OpenSSL 1.0.2 beta``