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

Merge pull request #42059 from pgporada/fix-grammar

Browse Source 
Fixes grammar
This commit is contained in:
Mike Place 2017-06-30 16:08:17 -05:00 committed by GitHub
commit 286eaf9237
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/pillar/__init__.py
View File

@ -568,7 +568,7 @@ class Pillar(object):
merged_tops = self.merge_tops(tops)
except TypeError as err:
merged_tops = OrderedDict()
errors.append('Error encountered while render pillar top file.')
errors.append('Error encountered while rendering pillar top file.')
return merged_tops, errors
def top_matches(self, top):