aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.rst
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-07-08 00:00:55 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-07-08 00:00:55 -0700
commit02f5caa833bf01e537f0bff94c3a71a675d234c4 (patch)
treef48b5ed4ce61b272bae4d7cba0884702c67387e7 /CHANGELOG.rst
parent7f68ccda2080c427f5e34b4ecc16cba9a030f2c6 (diff)
parent5a3e0754f94a280783e0d5b9c1082097566fa62f (diff)
downloadcryptography-02f5caa833bf01e537f0bff94c3a71a675d234c4.tar.gz
cryptography-02f5caa833bf01e537f0bff94c3a71a675d234c4.tar.bz2
cryptography-02f5caa833bf01e537f0bff94c3a71a675d234c4.zip
Merge branch 'master' into deprecation
Diffstat (limited to 'CHANGELOG.rst')
-rw-r--r--CHANGELOG.rst12
1 files changed, 12 insertions, 0 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cf5944fd..055c5abf 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,18 @@
Changelog
=========
+0.6 - `master`_
+~~~~~~~~~~~~~~~
+
+.. note:: This version is not yet released and is under active development.
+
+0.5.1 - 2014-07-07
+~~~~~~~~~~~~~~~~~~
+
+* Add
+ :class:`~cryptography.hazmat.backends.interfaces.PKCS8SerializationBackend`
+ support to :doc:`/hazmat/backends/multibackend`.
+
0.5 - 2014-07-07
~~~~~~~~~~~~~~~~