Compare commits
No commits in common. "75c91e72cb1fc38425fefc1189f8e1f5c8a7c207" and "27d178d852c9e07ed58751a38bc42b1153821bfd" have entirely different histories.
75c91e72cb
...
27d178d852
@ -54,13 +54,11 @@ salt:
|
||||
pillar_merge_lists: True
|
||||
pillar_source_merging_strategy: smart
|
||||
top_file_merging_strategy: same
|
||||
env_order: ['production']
|
||||
log_level: info
|
||||
show_jid: True
|
||||
timeout: 20
|
||||
gather_job_timeout: 20
|
||||
keep_jobs: 30
|
||||
ping_on_rotate: True
|
||||
user: ${'secret_salt:master:user'}
|
||||
syndic_user: ${'secret_salt:master:syndic_user'}
|
||||
cache.redis.unix_socket_path: ${'secret_salt:master:cache.redis.unix_socket_path'}
|
||||
|
Loading…
x
Reference in New Issue
Block a user