diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-06-09 15:09:12 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-06-09 15:09:12 -0700 |
| commit | e059529c038c8b9f012a9156e8d7d9adfad99b68 (patch) | |
| tree | 36862c78374eac131360f5a8dde3e33edd096455 | |
| parent | 799e483895911e0d7a3c836e93d294d3bedd7a40 (diff) | |
| parent | c2de25ff24c18771e12200a921017cb5e175bbc9 (diff) | |
Merge branch '2.1'
| -rw-r--r-- | paramiko/_version.py | 2 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/paramiko/_version.py b/paramiko/_version.py index 2ad47eb4..a6d1392b 100644 --- a/paramiko/_version.py +++ b/paramiko/_version.py @@ -1,2 +1,2 @@ -__version_info__ = (2, 1, 2) +__version_info__ = (2, 1, 3) __version__ = '.'.join(map(str, __version_info__)) diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 1b2aa031..38751472 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,10 @@ Changelog ========= +* :release:`2.1.3 <2017-06-09>` +* :release:`2.0.6 <2017-06-09>` +* :release:`1.18.3 <2017-06-09>` +* :release:`1.17.5 <2017-06-09>` * :bug:`865` SSHClient now requests the type of host key it has (e.g. from known_hosts) and does not consider a different type to be a "Missing" host key. This fixes a common case where an ECDSA key is in known_hosts and the |