Permalink
Browse files

Merge branch '1.5'

Conflicts:
	fabric/network.py
  • Loading branch information...
bitprophet committed Mar 1, 2013
2 parents e024989 + 374f6b0 commit 0a8a538703920a2f6f8bbaa5f7f943c6e28d831d
Showing with 1 addition and 0 deletions.
  1. +1 −0 fabric/network.py
View
@@ -171,6 +171,7 @@ def key_filenames():
# Honor SSH config
conf = ssh_config()
if 'identityfile' in conf:
+ # Assume a list here as we require Paramiko 1.10+
keys.extend(conf['identityfile'])
return map(os.path.expanduser, keys)

0 comments on commit 0a8a538

Please sign in to comment.