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

Don't be so explicit. Just use string_types.

Browse source
This commit is contained in:
rallytime 2016-04-01 17:12:39 -06:00
parent 083c477fd3
commit 0491513204
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/config.py
View file

@ -61,7 +61,7 @@ FLO_DIR = os.path.join(
'daemons', 'flo')
VALID_OPTS = {
'master': (list, salt.ext.six.string_types),
'master': (list, string_types),
'master_port': int,
'master_type': str,
'master_finger': str,
@ -143,7 +143,7 @@ VALID_OPTS = {
'grains': dict,
'permissive_pki_access': bool,
'default_include': str,
'update_url': (bool, salt.ext.six.string_types),
'update_url': (bool, string_types),
'update_restart_services': list,
'retry_dns': float,
'recon_max': float,
@ -209,7 +209,7 @@ VALID_OPTS = {
'ping_on_rotate': bool,
'peer': dict,
'preserve_minion_cache': bool,
'syndic_master': (salt.ext.six.string_types, list),
'syndic_master': (string_types, list),
'runner_dirs': list,
'client_acl': dict,
'client_acl_blacklist': dict,
@ -218,8 +218,8 @@ VALID_OPTS = {
'token_expire': int,
'file_recv': bool,
'file_recv_max_size': int,
'file_ignore_regex': (list, salt.ext.six.string_types),
'file_ignore_glob': (list, salt.ext.six.string_types),
'file_ignore_regex': (list, string_types),
'file_ignore_glob': (list, string_types),
'fileserver_backend': list,
'fileserver_followsymlinks': bool,
'fileserver_ignoresymlinks': bool,