diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-02-03 16:19:32 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-02-03 16:19:32 -0800 |
| commit | db80954cf1448f88fae78568dbd3d833da04054a (patch) | |
| tree | cf0243617ef483300973442a55e7a1fdc02ff1ff /docs | |
| parent | 559885087728c0233b243756fe698e4071fab971 (diff) | |
| download | cryptography-db80954cf1448f88fae78568dbd3d833da04054a.tar.gz cryptography-db80954cf1448f88fae78568dbd3d833da04054a.tar.bz2 cryptography-db80954cf1448f88fae78568dbd3d833da04054a.zip | |
Chanloge + versionadded
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/changelog.rst | 1 | ||||
| -rw-r--r-- | docs/hazmat/backends/multibackend.rst | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst index 2de9a329..e322b145 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -16,6 +16,7 @@ Changelog available, such as CentOS. * Added :class:`~cryptography.hazmat.primitives.kdf.pbkdf2.PBKDF2HMAC`. * Added :class:`~cryptography.hazmat.primitives.kdf.hkdf.HKDF`. +* Added :doc:`/hazmat/backends/multibackend`. 0.1 - 2014-01-08 ~~~~~~~~~~~~~~~~ diff --git a/docs/hazmat/backends/multibackend.rst b/docs/hazmat/backends/multibackend.rst index f1a88006..63177bef 100644 --- a/docs/hazmat/backends/multibackend.rst +++ b/docs/hazmat/backends/multibackend.rst @@ -7,6 +7,8 @@ MultiBackend .. class:: MultiBackend(backends) + .. versionadded:: 0.2 + This class allows you to combine multiple backends into a single backend which offers the combined features of all of its constituents. |