diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-07-16 14:37:26 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-07-16 14:37:26 -0700 |
| commit | 09db2fa40092c08e5d11eb68363819f2bc7ede19 (patch) | |
| tree | c2ada51c453c92b0bfddaa5288792c2b5d5988d5 | |
| parent | 250098ca84df65741c279d76de2ea6bc4f83aaa0 (diff) | |
| parent | 73667decb43cb4872fb72fba1ec050df514164d0 (diff) | |
| download | cryptography-09db2fa40092c08e5d11eb68363819f2bc7ede19.tar.gz cryptography-09db2fa40092c08e5d11eb68363819f2bc7ede19.tar.bz2 cryptography-09db2fa40092c08e5d11eb68363819f2bc7ede19.zip | |
Merge pull request #1265 from reaperhulk/update-platforms
update testing platforms/OpenSSL versions
| -rw-r--r-- | docs/installation.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/installation.rst b/docs/installation.rst index 339d8b76..6b8bb219 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -13,7 +13,7 @@ Supported platforms Currently we test ``cryptography`` on Python 2.6, 2.7, 3.2, 3.3, 3.4 and PyPy on these operating systems. -* x86-64 CentOS 6.4 and CentOS 5.x +* x86-64 CentOS 7.x, 6.4 and CentOS 5.x * x86-64 FreeBSD 9.2 and FreeBSD 10 * OS X 10.9 Mavericks, 10.8 Mountain Lion, and 10.7 Lion * x86-64 Ubuntu 12.04 LTS @@ -29,7 +29,7 @@ OpenSSL releases: * ``OpenSSL 1.0.0-fips`` (``RHEL/CentOS 6.4``) * ``OpenSSL 1.0.1`` * ``OpenSSL 1.0.1e-freebsd`` -* ``OpenSSL 1.0.1g`` +* ``OpenSSL 1.0.1h`` * ``OpenSSL 1.0.2 beta`` On Windows |