saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge #24185 with a couple of fixes

Browse source 
Refs #24185
This commit is contained in:
rallytime 2015-05-27 15:25:27 -06:00
parent 634d56bca0
commit d8daa9dcd7
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/_themes/saltstack2/layout.html vendored
View file

@ -53,10 +53,10 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '{{ url_root }}',
VERSION: '{{ release|e }}',
SEARCH_CX: '{{ search_cx }}',
SEARCH_CX: '{{ search_cx }}',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
HAS_SOURCE: {{ has_source|lower }}
HAS_SOURCE: '{{ has_source|lower }}'
};
</script>
{%- for scriptfile in script_files %}

2
doc/ref/states/all/salt.states.hipchat.rst
View file

@ -3,4 +3,4 @@ salt.states.hipchat
===================
.. automodule:: salt.states.hipchat
:members:
:members:

8
salt/client/ssh/client.py
View file

@ -14,7 +14,7 @@ class SSHClient(object):
'''
Create a client object for executing routines via the salt-ssh backend
.. versionadded:: 2015.5
.. versionadded:: 2015.5.0
'''
def __init__(self,
c_path=os.path.join(syspaths.CONFIG_DIR, 'master'),
@ -68,7 +68,7 @@ class SSHClient(object):
Execute a single command via the salt-ssh subsystem and return a
generator
.. versionadded:: 2015.5
.. versionadded:: 2015.5.0
'''
ssh = self._prep_ssh(
tgt,
@ -94,7 +94,7 @@ class SSHClient(object):
Execute a single command via the salt-ssh subsystem and return all
routines at once
.. versionadded:: 2015.5
.. versionadded:: 2015.5.0
'''
ssh = self._prep_ssh(
tgt,
@ -113,7 +113,7 @@ class SSHClient(object):
'''
Execute a salt-ssh call synchronously.
.. versionaddedd:: 2015.2
.. versionaddedd:: 2015.5.0
WARNING: Eauth is **NOT** respected