diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-07-25 21:11:15 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-07-25 21:11:15 -0700 |
| commit | 833d9f76be9676419d5a0eb3bd9a66ce27b40214 (patch) | |
| tree | 4f1ee5c257e2a0f5d1b7e36b6e779e0e812bed8c | |
| parent | 30acb91b85419bf6f852d3c53947c4b0366a35e3 (diff) | |
| parent | 889480a5d032772e14af896c8df838aaf5f86703 (diff) | |
Merge branch '2.0'
| -rw-r--r-- | paramiko/_version.py | 2 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/paramiko/_version.py b/paramiko/_version.py index d58548b7..c07c0b07 100644 --- a/paramiko/_version.py +++ b/paramiko/_version.py @@ -1,2 +1,2 @@ -__version_info__ = (2, 0, 1) +__version_info__ = (2, 0, 2) __version__ = '.'.join(map(str, __version_info__)) diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 96d2989d..c7149d9a 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,9 @@ Changelog ========= +* :release:`2.0.2 <2016-07-25>` +* :release:`1.17.2 <2016-07-25>` +* :release:`1.16.3 <2016-07-25>` * :bug:`673 (1.16+)` (via :issue:`681`) Fix protocol banner read errors (``SSHException``) which would occasionally pop up when using ``ProxyCommand`` gatewaying. Thanks to ``@Depado`` for the initial report and |