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

bring back serial comma due to decision in #18952

Browse Source
This commit is contained in:
Arnold Bechtoldt 2015-01-26 12:59:29 +01:00 committed by rallytime
parent d2eb6b6f0c
commit a46e5b224d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/states/file.py
View File

@ -1356,7 +1356,7 @@ def managed(name,
if len([_f for _f in [contents, contents_pillar, contents_grains] if _f]) > 1:
return _error(
ret, 'Only one of contents, contents_pillar and contents_grains is permitted')
ret, 'Only one of contents, contents_pillar, and contents_grains is permitted')
# If contents_pillar was used, get the pillar data
if contents_pillar: