diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-06-13 13:28:25 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-06-13 13:28:25 -0700 |
| commit | 5bc431b2a69d8e325f00ecf199c6ea76a313b176 (patch) | |
| tree | bc73aa2ec8996028c23f65839154c4631a5fb88e | |
| parent | e5645e5ad874adfcb2970fc17b880fbb5ea131aa (diff) | |
| parent | 032b8221c1b44160fe91829296eb21a92afc18e1 (diff) | |
Merge branch '2.2'
| -rw-r--r-- | paramiko/_version.py | 2 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/paramiko/_version.py b/paramiko/_version.py index 6ccc2229..c8ca86d1 100644 --- a/paramiko/_version.py +++ b/paramiko/_version.py @@ -1,2 +1,2 @@ -__version_info__ = (2, 2, 0) +__version_info__ = (2, 2, 1) __version__ = '.'.join(map(str, __version_info__)) diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index bed4fd7f..dea044bf 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,7 @@ Changelog ========= +* :release:`2.2.1 <2017-06-13>` * :bug:`993` Ed25519 host keys were not comparable/hashable, causing an exception if such a key existed in a ``known_hosts`` file. Thanks to Oleh Prypin for the report and Pierce Lopez for the fix. |