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

Merge branch '1.10' into 1.11. 

Also bump versions like a dummy.

Conflicts:
	paramiko/__init__.py
	setup.py
This commit is contained in:
Jeff Forcier 2014-03-13 21:27:37 -07:00
parent 148f3d2fd4 4fdb4b5ae5
commit c538a00012
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
paramiko/__init__.py
View File

@ -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)"

2
setup.py
View File

@ -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",

1
sites/www/changelog.rst
View File

@ -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.