 Stefan Priebe
|
52fc6daac0
ZMQ: add an option for zmq.BACKLOG to salt master (zmq_backlog)
|
8 years ago |
|
Dmitry Kuzmenko
|
dad748f57a
Data cache plugin configuration documentation.
|
8 years ago |
|
Mike Place
|
df462cbe3e
Merge pull request #38212 from disaster123/develop_zmq_backlog
|
8 years ago |
|
Mike Place
|
9350808fea
Merge pull request #38361 from rallytime/deprecate-client_acl-client_acl_blacklist
|
8 years ago |
|
rallytime
|
a9f85f0dbe
Remove support for client_acl and client_acl_blacklist
|
8 years ago |
|
rallytime
|
8f80916432
Merge branch '2016.11' into 'develop'
|
8 years ago |
|
Stefan Priebe
|
15196c80be
ZMQ: add an option for zmq.BACKLOG to salt master (zmq_backlog)
|
8 years ago |
|
rallytime
|
5940db5b3f
Merge branch '2016.3' into '2016.11'
|
8 years ago |
|
rallytime
|
4a62d01577
Add docs for syndic_wait setting
|
8 years ago |
|
rallytime
|
4998b8d116
Merge branch '2016.11' into 'develop'
|
8 years ago |
|
rallytime
|
8fd53a4808
Merge branch '2016.3' into '2016.11'
|
8 years ago |
|
Denys Havrysh
|
7d9bc9abce
syndic_master: correct default value, documentation and example config
|
8 years ago |
|
rallytime
|
b3340c3a73
Merge branch '2016.11' into 'develop'
|
8 years ago |
|
Dmitry Kuzmenko
|
0c607ccaec
An example configuration for TLS/SSL. (#37859)
|
8 years ago |
|
Denys Havrysh
|
83d6a44254
Add `ssh_log_file` option to master config and documentation
|
8 years ago |
|
Denys Havrysh
|
c8a0915460
Fix configuration example and documentation for `syndic_log_file` option
|
8 years ago |
|
rallytime
|
5d7b4e4511
Merge branch 'carbon' into 'develop'
|
8 years ago |
|
rallytime
|
112903ad7e
Merge branch '2016.3' into 'carbon'
|
8 years ago |
|
rallytime
|
da574e5b03
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
Bo Maryniuk
|
46fd6d80c9
Add a description of the thin/min parameters to the master config
|
8 years ago |
|
Bo Maryniuk
|
3bfb17ee62
Add a description of the thin/min parameters to the master config
|
8 years ago |
|
rallytime
|
d5bbd91c14
Merge branch '2016.3' into 'carbon'
|
8 years ago |
|
Nicole Thomas
|
5548ed771d
Back-port #36435 to 2016.3 (#36532)
|
8 years ago |
|
Yoram Hekma
|
6becc0d1e7
Updated documentation
|
8 years ago |
|
ed lane
|
40c89474aa
add keepalive for sockets initiated by master.
|
8 years ago |
|
Erik Johnson
|
6f8984630d
Change default for runner_returns to True
|
8 years ago |
|
rallytime
|
82e9cb748f
Merge branch '2016.3' into 'develop'
|
8 years ago |
|
Nicole Thomas
|
96792663da
Add engines to list of extension module options in master config docs (#35864)
|
8 years ago |
|
Nicole Thomas
|
f7f8221169
Everything in the sample master config file should be commented out (#35611)
|
8 years ago |
|
Mike Place
|
69b44bc6f8
Merge pull request #35500 from rallytime/fix-35068
|
8 years ago |
