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 #14077 from jacksontj/pubfilter

Browse Source 
Change the defaults to be backwards compatible (fix #13285)
This commit is contained in:
Thomas S Hatch 2014-07-09 21:20:27 -06:00
commit 5008d8d750
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/config.py
View File

@ -374,7 +374,7 @@ DEFAULT_MINION_OPTS = {
'ping_interval': 0,
'username': None,
'password': None,
'zmq_filtering': True,
'zmq_filtering': False,
}
DEFAULT_MASTER_OPTS = {
@ -531,7 +531,7 @@ DEFAULT_MASTER_OPTS = {
'master_sign_pubkey': False,
'master_pubkey_signature': 'master_pubkey_signature',
'master_use_pubkey_signature': False,
'zmq_filtering': True,
'zmq_filtering': False,
}
# ----- Salt Cloud Configuration Defaults ----------------------------------->