diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-10 12:58:02 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-10 12:58:02 -0700 |
| commit | bade24d2d5b76c3f38bf0310ea8072184ab95b2a (patch) | |
| tree | 160c9e52fc9911696247c1fe9e4bfec3c15ab662 /sites/docs/api | |
| parent | 0063e64046c732e8c50fc5f54234942feaa313d9 (diff) | |
| parent | e71f4e59878a636268475f642ed4e98a1b3e375d (diff) | |
Merge branch 'master' into 216-int
Conflicts:
paramiko/transport.py
paramiko/util.py
tests/test_client.py
Diffstat (limited to 'sites/docs/api')
| -rw-r--r-- | sites/docs/api/agent.rst | 2 | ||||
| -rw-r--r-- | sites/docs/api/kex_gss.rst | 5 | ||||
| -rw-r--r-- | sites/docs/api/ssh_gss.rst | 14 |
3 files changed, 20 insertions, 1 deletions
diff --git a/sites/docs/api/agent.rst b/sites/docs/api/agent.rst index 3b614a82..f01ad972 100644 --- a/sites/docs/api/agent.rst +++ b/sites/docs/api/agent.rst @@ -1,4 +1,4 @@ -SSH Agents +SSH agents ========== .. automodule:: paramiko.agent diff --git a/sites/docs/api/kex_gss.rst b/sites/docs/api/kex_gss.rst new file mode 100644 index 00000000..9fd09221 --- /dev/null +++ b/sites/docs/api/kex_gss.rst @@ -0,0 +1,5 @@ +GSS-API key exchange +==================== + +.. automodule:: paramiko.kex_gss + :member-order: bysource diff --git a/sites/docs/api/ssh_gss.rst b/sites/docs/api/ssh_gss.rst new file mode 100644 index 00000000..7a687e11 --- /dev/null +++ b/sites/docs/api/ssh_gss.rst @@ -0,0 +1,14 @@ +GSS-API authentication +====================== + +.. automodule:: paramiko.ssh_gss + :member-order: bysource + +.. autoclass:: _SSH_GSSAuth + :member-order: bysource + +.. autoclass:: _SSH_GSSAPI + :member-order: bysource + +.. autoclass:: _SSH_SSPI + :member-order: bysource |