diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-13 21:27:37 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-13 21:27:46 -0700 |
| commit | c538a000121d66e388bcb92c19cc018efcf4cce4 (patch) | |
| tree | 15056124661c5f5d3540741ac75d66f1ea4838df | |
| parent | 148f3d2fd46ca58c641a23bc7dad313460f9eb5d (diff) | |
| parent | 4fdb4b5ae52b8e7cada05c5590a0cd0ab1b575d5 (diff) | |
Merge branch '1.10' into 1.11.
Also bump versions like a dummy.
Conflicts:
paramiko/__init__.py
setup.py
| -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 ada1fbd8..ce3f0cf9 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -23,7 +23,7 @@ if sys.version_info < (2, 5): __author__ = "Jeff Forcier <jeff@bitprophet.org>" -__version__ = "1.11.4" +__version__ = "1.11.5" __version_info__ = tuple([ int(d) for d in __version__.split(".") ]) __license__ = "GNU Lesser General Public License (LGPL)" @@ -52,7 +52,7 @@ if sys.platform == 'darwin': setup(name = "paramiko", - version = "1.11.4", + version = "1.11.5", 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 19383cdc..3868f329 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,7 @@ Changelog ========= +* :release:`1.10.7 <2014-03-13>` * :support:`256 backported` Convert API documentation to Sphinx, yielding a new API docs website to replace the old Epydoc one. Thanks to Olle Lundberg for the initial conversion work. |