summaryrefslogtreecommitdiffhomepage
path: root/paramiko/agent.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-01-24 09:16:21 -0800
committerJeff Forcier <jeff@bitprophet.org>2017-01-24 09:16:21 -0800
commit76d0cf1b985e7ce776c0f716d5c3a4baecab1531 (patch)
tree5eee671191bdd73e69c6849371765f89bf2d613c /paramiko/agent.py
parentfd62d87c6f04c5266e73ad50a97d4689f7f1892c (diff)
parent3ed75f66a19eea3d8812423c1617d1d362e96d6d (diff)
Merge branch '1.17' into 1.18
Diffstat (limited to 'paramiko/agent.py')
-rw-r--r--paramiko/agent.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/paramiko/agent.py b/paramiko/agent.py
index 6a8e7fb4..c13810bb 100644
--- a/paramiko/agent.py
+++ b/paramiko/agent.py
@@ -331,7 +331,7 @@ class Agent(AgentSSH):
"""
Client interface for using private keys from an SSH agent running on the
local machine. If an SSH agent is running, this class can be used to
- connect to it and retreive `.PKey` objects which can be used when
+ connect to it and retrieve `.PKey` objects which can be used when
attempting to authenticate to remote SSH servers.
Upon initialization, a session with the local machine's SSH agent is