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

Merge pull request #31707 from sjorge/2016.3-top

Browse Source 
Fix incorrect default types for master_tops and file_ignore_regex
This commit is contained in:
Nicole Thomas 2016-03-09 16:33:26 -07:00
commit 5424159604
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/__init__.py
View File

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