Merge pull request #23552 from garethgreenaway/2015_5_returner_fix_broken_previous_pr

Fix for an issue caused by a previous pull request
This commit is contained in:
Justin Findlay 2015-05-11 15:54:59 -06:00
commit b593328176

View file

@ -90,8 +90,8 @@ def get_returner_options(virtualname=None,
_options.update(
_fetch_profile_opts(
cfg,
__salt__,
virtualname,
__salt__,
_options,
profile_attr,
profile_attrs