saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #31723 from sjorge/2015.8-file_ignore_regex

Browse source 
file_ignore_regex is a list, not bool
This commit is contained in:
Nicole Thomas 2016-03-09 16:36:10 -07:00
commit baeefac252
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/config.py
View file

@ -540,7 +540,7 @@ VALID_OPTS = {
'token_expire': int,
'file_recv': bool,
'file_recv_max_size': int,
'file_ignore_regex': bool,
'file_ignore_regex': list,
'file_ignore_glob': bool,
'fileserver_backend': list,
'fileserver_followsymlinks': bool,
@ -831,7 +831,7 @@ DEFAULT_MINION_OPTS = {
'fileserver_limit_traversal': False,
'file_recv': False,
'file_recv_max_size': 100,
'file_ignore_regex': None,
'file_ignore_regex': [],
'file_ignore_glob': None,
'fileserver_backend': ['roots'],
'fileserver_followsymlinks': True,
@ -1091,7 +1091,7 @@ DEFAULT_MASTER_OPTS = {
'file_recv': False,
'file_recv_max_size': 100,
'file_buffer_size': 1048576,
'file_ignore_regex': None,
'file_ignore_regex': [],
'file_ignore_glob': None,
'fileserver_backend': ['roots'],
'fileserver_followsymlinks': True,