 rallytime
|
19a3ecd5b8
Merge branch '2016.11' into 'nitrogen'
|
vor 7 Jahren |
|
Michael Lustfield
|
49bd8bfed9
Fixing a spelling error.
|
vor 7 Jahren |
|
Michael Lustfield
|
a4bae3cda9
Cleaning up (removing) use of safe_batch token.
|
vor 7 Jahren |
|
Michael Lustfield
|
02614bdfd1
New feature: automatic job batching
|
vor 7 Jahren |
|
rallytime
|
fc756c595c
Merge branch '2016.3' into '2016.11'
|
vor 7 Jahren |
|
Matej Urbas
|
b9591f2807
Fixes typo in conf/master.
|
vor 7 Jahren |
|
C. R. Oldham
|
65ea8997b7
Add allow_minion_key_revoke config option
|
vor 7 Jahren |
|
rallytime
|
71f3c73150
Merge branch '2016.11' into 'develop'
|
vor 7 Jahren |
|
Dmitry Kuzmenko
|
82c45b1a52
Memcache documentation and minor updates.
|
vor 7 Jahren |
|
Dmitry Kuzmenko
|
b09d83b6d7
Allow to use different auth module for ACL.
|
vor 7 Jahren |
|
Dmitry Kuzmenko
|
9309a83d21
Optionally keep auth list in token.
|
vor 7 Jahren |
|
Felix Dreissig
|
5371bc0996
Fix comments about the "hash_type" option
|
vor 7 Jahren |
|
Erik Johnson
|
d35c2f810c
salt.utils.gitfs: remove dulwich support, make refspecs configurable (#39210)
|
vor 7 Jahren |
|
Erik Johnson
|
894f365090
Update master config template with pillar decryption args
|
vor 7 Jahren |
|
rallytime
|
8928436bdd
Merge branch '2016.11' into 'develop'
|
vor 7 Jahren |
|
rallytime
|
fdaa5ac1b0
Merge branch '2016.3' into '2016.11'
|
vor 7 Jahren |
|
Erik Johnson
|
6b014e53fc
Rename on_demand_pillar to on_demand_ext_pillar
|
vor 7 Jahren |
|
Erik Johnson
|
d216f90c63
Document new on_demand_pillar option and add to config template
|
vor 7 Jahren |
|
rallytime
|
49f57ba3f1
Merge branch '2016.11' into 'develop'
|
vor 7 Jahren |
|
Eric Radman
|
9b5d28df0c
Extend support for pillarenv_from_saltenv to master config
|
vor 7 Jahren |
|
Bo Maryniuk
|
ffbd45062e
Explain what it is about and how to configure that
|
vor 8 Jahren |
|
rallytime
|
5b43a252c9
Merge branch '2016.11' into 'develop'
|
vor 7 Jahren |
|
rallytime
|
30e8a66fb0
Merge branch '2016.3' into '2016.11'
|
vor 7 Jahren |
|
rallytime
|
d24776f5e9
Merge branch '2015.8' into '2016.3'
|
vor 7 Jahren |
|
rallytime
|
b910499dbe
Various follow up fixes
|
vor 7 Jahren |
|
Bo Maryniuk
|
9b0a786aeb
Explain what it is about and how to configure that
|
vor 8 Jahren |
|
Mike Place
|
5b60b04195
Merge pull request #38596 from isbm/isbm-disable-custom-roster-for-api
|
vor 8 Jahren |
|
Bo Maryniuk
|
1bb92cc8a4
Explain what it is about and how to configure that
|
vor 8 Jahren |
|
rallytime
|
a2927226ea
Merge branch '2016.11' into 'develop'
|
vor 8 Jahren |
|
Mike Place
|
6ee7b2bae7
Merge pull request #38377 from DSRCorporation/features/consul_cache
|
vor 8 Jahren |
