Merge branch '2016.11' into '2017.7'

No conflicts.
This commit is contained in:
rallytime 2018-01-02 12:23:50 -05:00
commit 5d9a1e91e9
No known key found for this signature in database
GPG Key ID: E8F1A4B90D0DEA19

View File

@ -274,7 +274,7 @@ def _get_extra_options(**kwargs):
ret = []
kwargs = salt.utils.clean_kwargs(**kwargs)
for key, value in six.iteritems(kwargs):
if isinstance(key, six.string_types):
if isinstance(value, six.string_types):
ret.append('--{0}=\'{1}\''.format(key, value))
elif value is True:
ret.append('--{0}'.format(key))