diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-02-14 09:39:38 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-02-14 09:39:38 -0800 |
| commit | 3fcde4e7f419b57859d73bea86ce4c041912b2d3 (patch) | |
| tree | fc0a7aa4398d8ba37adbe60620e2e794aaa337ab | |
| parent | 6aada73b0ecc90861af19fbc2b8e86eb05b1f274 (diff) | |
| parent | fb786bea9cff8fba3c6852d216dbbcbafbbb524f (diff) | |
Merge branch '1.12'
Conflicts:
sites/www/changelog.rst
| -rw-r--r-- | paramiko/__init__.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/paramiko/__init__.py b/paramiko/__init__.py index c996302a..648b595e 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -57,7 +57,7 @@ if sys.version_info < (2, 5): __author__ = "Jeff Forcier <jeff@bitprophet.org>" -__version__ = "1.12.1" +__version__ = "1.12.2" __version_info__ = tuple([ int(d) for d in __version__.split(".") ]) __license__ = "GNU Lesser General Public License (LGPL)" @@ -54,7 +54,7 @@ if sys.platform == 'darwin': setup(name = "paramiko", - version = "1.12.1", + version = "1.12.2", description = "SSH2 protocol library", author = "Jeff Forcier", author_email = "jeff@bitprophet.org", diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index 0340c0c6..89db0597 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,9 @@ 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 ``Transport.get_banner()``. Thanks to ``@Jhoanor`` for the patch. * :bug:`252` (`Fabric #1020 <https://github.com/fabric/fabric/issues/1020>`_) |