Merge branch '2.0'

lyutian · Jun 21, 2016 · 0ae019c · 0ae019c
2 parents 063ae69 + d5ec633
commit 0ae019c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/paramiko/_version.py b/paramiko/_version.py
@@ -1,2 +1,2 @@
-__version_info__ = (2, 0, 0)
+__version_info__ = (2, 0, 1)
 __version__ = '.'.join(map(str, __version_info__))
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
@@ -2,6 +2,9 @@
 Changelog
 =========
 
+* :release:`2.0.1 <2016-06-21>`
+* :release:`1.17.1 <2016-06-21>`
+* :release:`1.16.2 <2016-06-21>`
 * :bug:`520 (1.16+)` (Partial fix) Fix at least one instance of race condition
   driven threading hangs at end of the Python interpreter session. (Includes a
   docs update as well - always make sure to ``.close()`` your clients!)