Permalink
Browse files

Merge branch '1.12' into 1.13

# Conflicts:
#	sites/www/changelog.rst
  • Loading branch information...
2 parents 26f684c + 2a94593 commit 39e6c4d8c0e6db064fd42af18291e15372b42f03 @bitprophet bitprophet committed Dec 13, 2016
Showing with 3 additions and 1 deletion.
  1. +1 −1 fabric/network.py
  2. +2 −0 sites/www/changelog.rst
View
@@ -472,7 +472,7 @@ def connect(user, host, port, cache, seek_gateway=True):
sock=sock,
)
for suffix in ('auth', 'deleg_creds', 'kex'):
- name = 'gss_{0}'.format(suffix)
+ name = "gss_" + suffix
val = env.get(name, None)
if val is not None:
kwargs[name] = val
@@ -2,6 +2,8 @@
Changelog
=========
+* :bug:`1514` Compatibility with Python 2.5 was broken by using the ``format()``
+ method of a string (only in 1.11+). Report by ``@pedrudehuere``.
* :release:`1.13.1 <2016-12-09>`
* :bug:`1462` Make a PyCrypto-specific import and method call optional to avoid
``ImportError`` problems under Paramiko 2.x. Thanks to Alex Gaynor for catch

0 comments on commit 39e6c4d

Please sign in to comment.