valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #25871 from rallytime/bp-25829

Browse Source 
Back-port #25829 to 2015.5
This commit is contained in:
Thomas S Hatch 2015-07-30 11:33:42 -06:00
commit bf8bd38da7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/man/salt.7
View File

@ -160602,7 +160602,7 @@ An optional string that points to a salt module that returns True or False
based on the returned data dict for individual minions
.TP
.B ssh
Set to \fITrue\fP to use the ssh client instaed of the standard salt client
Set to \fITrue\fP to use the ssh client instead of the standard salt client
.UNINDENT
.UNINDENT
.INDENT 0.0
@ -160662,7 +160662,7 @@ Pass the \fBpillar\fP kwarg through to the state function
The default salt environment to pull sls files from
.TP
.B ssh
Set to \fITrue\fP to use the ssh client instaed of the standard salt client
Set to \fITrue\fP to use the ssh client instead of the standard salt client
.TP
.B roster
In the event of using salt\-ssh, a roster system can be set

4
salt/states/saltmod.py
View File

@ -95,7 +95,7 @@ def state(
The default salt environment to pull sls files from
ssh
Set to `True` to use the ssh client instaed of the standard salt client
Set to `True` to use the ssh client instead of the standard salt client
roster
In the event of using salt-ssh, a roster system can be set
@ -337,7 +337,7 @@ def function(
based on the returned data dict for individual minions
ssh
Set to `True` to use the ssh client instaed of the standard salt client
Set to `True` to use the ssh client instead of the standard salt client
'''
ret = {'name': name,
'changes': {},