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

Merge branch '1.12' into 1.13 

Conflicts:
	paramiko/__init__.py
	setup.py
	sites/www/changelog.rst
This commit is contained in:
Jeff Forcier 2014-05-07 14:10:07 -07:00
parent 5837b7c21a 09e9d48db0
commit c7f67445f7
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sites/www/changelog.rst
View File

@ -2,6 +2,8 @@
Changelog
=========
* :release:`1.12.4 <2014-05-07>`
* :release:`1.11.6 <2014-05-07>`
* :bug:`-` `paramiko.file.BufferedFile.read` incorrectly returned text strings
after the Python 3 migration, despite bytes being more appropriate for file
contents (which may be binary or of an unknown encoding.) This has been