aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-02-20 11:59:09 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2015-02-20 11:59:09 -0800
commit9bc5d5052e826c53ab42d76dbd427ffd2d444e8d (patch)
treef3ff5603b3f63a4c74ac9eb3f92dcb0ae070f4bd
parent9543e4e2dbe09ef9af20fe38ce80daf4eb8d2664 (diff)
parent77f540d1f23a77facc09cd11b6e8da5825bca44a (diff)
downloadcryptography-9bc5d5052e826c53ab42d76dbd427ffd2d444e8d.tar.gz
cryptography-9bc5d5052e826c53ab42d76dbd427ffd2d444e8d.tar.bz2
cryptography-9bc5d5052e826c53ab42d76dbd427ffd2d444e8d.zip
Merge pull request #1684 from reaperhulk/remove-freebsd92
we don't test on freebsd 9.x any more
-rw-r--r--CHANGELOG.rst1
-rw-r--r--docs/installation.rst2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e8c25219..6af5d1c8 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -72,6 +72,7 @@ Changelog
* Added support for parsing X.509 names. See the
:doc:`X.509 documentation</x509>` for more information.
* Fixed building against LibreSSL, a compile-time substitute for OpenSSL.
+* FreeBSD 9.2 was removed from the continuous integration system.
0.7.2 - 2015-01-16
~~~~~~~~~~~~~~~~~~
diff --git a/docs/installation.rst b/docs/installation.rst
index c8a37bfa..30f50646 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -14,7 +14,7 @@ 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 7.x, 6.4 and CentOS 5.x
-* x86-64 FreeBSD 9.2 and FreeBSD 10
+* x86-64 FreeBSD 10
* OS X 10.10 Yosemite, 10.9 Mavericks, 10.8 Mountain Lion, and 10.7 Lion
* x86-64 Ubuntu 12.04 LTS
* x86-64 Debian Wheezy (7.x) and Jessie (8.x)