diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-08-25 23:43:52 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-08-25 23:43:52 -0700 |
| commit | 9cf96d459a75d6ef4df167d8b7aa62dfa90ef774 (patch) | |
| tree | 9a2a9b9e7b56c3ceef365d2a93914445401d99a9 | |
| parent | 75be4122c5750c7f26ca0dc51c3b51c69264f3c4 (diff) | |
| parent | d7b93df7aaf9f409da7578a107829c138d042121 (diff) | |
Merge branch '1.14'
| -rw-r--r-- | paramiko/__init__.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/paramiko/__init__.py b/paramiko/__init__.py index 4c62ad4a..2ebc8a65 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -23,7 +23,7 @@ if sys.version_info < (2, 6): __author__ = "Jeff Forcier <jeff@bitprophet.org>" -__version__ = "1.14.0" +__version__ = "1.14.1" __version_info__ = tuple([ int(d) for d in __version__.split(".") ]) __license__ = "GNU Lesser General Public License (LGPL)" @@ -56,7 +56,7 @@ if sys.platform == 'darwin': setup( name = "paramiko", - version = "1.14.0", + version = "1.14.1", description = "SSH2 protocol library", long_description = longdesc, author = "Jeff Forcier", diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index d2981f29..089ec30e 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,7 @@ Changelog ========= +* :release:`1.14.1 <2014-08-25>` * :release:`1.13.2 <2014-08-25>` * :bug:`376` Be less aggressive about expanding variables in ``ssh_config`` files, which results in a speedup of SSH config parsing. Credit to Olle |