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

Cleanup merge

Browse Source
This commit is contained in:
Thomas Jackson 2015-03-18 08:11:38 -07:00
parent 70155ddd49
commit a95f81233c
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/runner.py
View File

@ -53,7 +53,6 @@ class RunnerClient(mixins.SyncClientMixin, mixins.AsyncClientMixin, object):
.. code-block:: python .. code-block:: python
<<<<<<< HEAD
>>> opts = salt.config.master_config('/etc/salt/master') >>> opts = salt.config.master_config('/etc/salt/master')
>>> runner = salt.runner.RunnerClient(opts) >>> runner = salt.runner.RunnerClient(opts)
>>> runner.cmd('jobs.list_jobs', []) >>> runner.cmd('jobs.list_jobs', [])