Skip to content

Commit

Permalink
Fixing example code block. Fixing pylint space error.
Browse files Browse the repository at this point in the history
  • Loading branch information
onlyanegg committed May 18, 2018
1 parent 5fc12d6 commit f7de312
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion salt/modules/slsutil.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ def merge(obj_a, obj_b, strategy='smart', renderer='yaml', merge_lists=False):
return salt.utils.dictupdate.merge(obj_a, obj_b, strategy, renderer,
merge_lists)


def merge_all(lst, strategy='smart', renderer='yaml', merge_lists=False):
'''
Merge a list of objects into each other in order
Expand All @@ -61,7 +62,7 @@ def merge_all(lst, strategy='smart', renderer='yaml', merge_lists=False):
.. code-block:: shell
> salt '*' slsutil.merge_all '[{foo: Foo}, {foo: Bar}]'
> salt-call --output=txt slsutil.merge_all '[{foo: Foo}, {foo: Bar}]'
local: {u'foo': u'Bar'}
'''

Expand Down

0 comments on commit f7de312

Please sign in to comment.