Skip to content

Commit

Permalink
Merge pull request #1540 from reaperhulk/update-changelog-0.7
Browse files Browse the repository at this point in the history
0.7 changelog and version bump
  • Loading branch information
alex committed Dec 18, 2014
2 parents 882e64b + e813509 commit 4597edf
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
10 changes: 4 additions & 6 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
Changelog
=========

0.7 - `master`_
~~~~~~~~~~~~~~~

.. note:: This version is not yet released and is under active development.
0.7 - 2014-12-17
~~~~~~~~~~~~~~~~

* Cryptography has been relicensed from the Apache Software License, Version
2.0, to being available under *either* the Apache Software License, Version
Expand All @@ -20,8 +18,8 @@ Changelog
:doc:`/hazmat/primitives/asymmetric/utils`.
* Added
:func:`~cryptography.hazmat.primitives.serialization.load_ssh_public_key` to
support the loading of OpenSSH public keys (:rfc:`4253`). Currently, only RSA
keys are supported.
support the loading of OpenSSH public keys (:rfc:`4253`). Only RSA and DSA
keys are currently supported.
* Added initial support for X.509 certificate parsing. See the
:doc:`X.509 documentation</x509>` for more information.

Expand Down
2 changes: 1 addition & 1 deletion src/cryptography/__about__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
" and primitives to Python developers.")
__uri__ = "https://github.com/pyca/cryptography"

__version__ = "0.7.dev1"
__version__ = "0.7"

__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"
Expand Down
2 changes: 1 addition & 1 deletion vectors/cryptography_vectors/__about__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

__uri__ = "https://github.com/pyca/cryptography"

__version__ = "0.7.dev1"
__version__ = "0.7"

__author__ = "The cryptography developers"
__email__ = "cryptography-dev@python.org"
Expand Down

0 comments on commit 4597edf

Please sign in to comment.