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

Merge pull request #12088 from terminalmage/quickfix

Browse Source 
Fix warn_until call
This commit is contained in:
Colton Myers 2014-04-17 15:19:59 -06:00
commit 4cd38ed338
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/states/dockerio.py
View File

@ -459,8 +459,8 @@ def run(name,
docked_onlyif=None,
docked_unless=None,
*args, **kwargs):
'''Run a command in a specific container
'''
Run a command in a specific container
You can match by either name or hostname
@ -487,9 +487,10 @@ def run(name,
'''
if hostname:
salt.utils.warn_until((0, 19),
'The argument \'hostname\' argument'
' has been deprecated.')
salt.utils.warn_until(
'Helium',
'The \'hostname\' argument has been deprecated.'
)
retcode = __salt__['docker.retcode']
drun_all = __salt__['docker.run_all']
valid = functools.partial(_valid, name=name)