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

Merge pull request #49263 from terminalmage/issue49159

Browse Source 
Revert default value for ipv6 to None
This commit is contained in:
Erik Johnson 2018-08-23 08:02:12 -05:00 committed by GitHub
commit 2a2bd48d83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -373,7 +373,7 @@ VALID_OPTS = {
'ipc_mode': six.string_types, 'ipc_mode': six.string_types,
# Enable ipv6 support for daemons # Enable ipv6 support for daemons
'ipv6': bool, 'ipv6': (type(None), bool),
# The chunk size to use when streaming files with the file server # The chunk size to use when streaming files with the file server
'file_buffer_size': int, 'file_buffer_size': int,
@ -1354,7 +1354,7 @@ DEFAULT_MINION_OPTS = {
'mine_interval': 60, 'mine_interval': 60,
'ipc_mode': _DFLT_IPC_MODE, 'ipc_mode': _DFLT_IPC_MODE,
'ipc_write_buffer': _DFLT_IPC_WBUFFER, 'ipc_write_buffer': _DFLT_IPC_WBUFFER,
'ipv6': False, 'ipv6': None,
'file_buffer_size': 262144, 'file_buffer_size': 262144,
'tcp_pub_port': 4510, 'tcp_pub_port': 4510,
'tcp_pull_port': 4511, 'tcp_pull_port': 4511,
@ -1679,7 +1679,7 @@ DEFAULT_MASTER_OPTS = {
'enforce_mine_cache': False, 'enforce_mine_cache': False,
'ipc_mode': _DFLT_IPC_MODE, 'ipc_mode': _DFLT_IPC_MODE,
'ipc_write_buffer': _DFLT_IPC_WBUFFER, 'ipc_write_buffer': _DFLT_IPC_WBUFFER,
'ipv6': False, 'ipv6': None,
'tcp_master_pub_port': 4512, 'tcp_master_pub_port': 4512,
'tcp_master_pull_port': 4513, 'tcp_master_pull_port': 4513,
'tcp_master_publish_pull': 4514, 'tcp_master_publish_pull': 4514,