dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '1.12' 

Conflicts:
	sites/www/changelog.rst
This commit is contained in:
Jeff Forcier 2014-02-14 09:39:38 -08:00
parent 6aada73b0e fb786bea9c
commit 3fcde4e7f4
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
paramiko/__init__.py
View File

@ -57,7 +57,7 @@ if sys.version_info < (2, 5):
__author__ = "Jeff Forcier <jeff@bitprophet.org>" __author__ = "Jeff Forcier <jeff@bitprophet.org>"
__version__ = "1.12.1" __version__ = "1.12.2"
__version_info__ = tuple([ int(d) for d in __version__.split(".") ]) __version_info__ = tuple([ int(d) for d in __version__.split(".") ])
__license__ = "GNU Lesser General Public License (LGPL)" __license__ = "GNU Lesser General Public License (LGPL)"

2
setup.py
View File

@ -54,7 +54,7 @@ if sys.platform == 'darwin':
setup(name = "paramiko", setup(name = "paramiko",
version = "1.12.1", version = "1.12.2",
description = "SSH2 protocol library", description = "SSH2 protocol library",
author = "Jeff Forcier", author = "Jeff Forcier",
author_email = "jeff@bitprophet.org", author_email = "jeff@bitprophet.org",

3
sites/www/changelog.rst
View File

@ -2,6 +2,9 @@
Changelog Changelog
========= =========
* :release:`1.12.2 <2014-02-14>`
* :release:`1.11.4 <2014-02-14>`
* :release:`1.10.6 <2014-02-14>`
* :feature:`58` Allow client code to access the stored SSH server banner via * :feature:`58` Allow client code to access the stored SSH server banner via
``Transport.get_banner()``. Thanks to ``@Jhoanor`` for the patch. ``Transport.get_banner()``. Thanks to ``@Jhoanor`` for the patch.
* :bug:`252` (`Fabric #1020 <https://github.com/fabric/fabric/issues/1020>`_) * :bug:`252` (`Fabric #1020 <https://github.com/fabric/fabric/issues/1020>`_)