Commit History

Author SHA1 Message Date
  Ken Jordan 9ff03c2d43 Update Salt Mine documentation to show that the mine_interval option is configured in minutes. 7 years ago
  rallytime c673b64583 Merge branch '2016.11' into '2017.7' 7 years ago
  rallytime b40f980632 Add more documentation for config options that are missing from master/minion docs 7 years ago
  rallytime 2cfabc467c Merge branch '2016.11' into '2017.7' 7 years ago
  rallytime c828ad803a Add a bunch of config options to the various master/minion files that are missing 7 years ago
  Felix Dreissig 5b55fb2452 Fix comments about the "hash_type" option 7 years ago
  rallytime 6493880bde Merge branch '2016.11' into 'nitrogen' 7 years ago
  Mike Place 8ab321f934 A random startup delay option for minions 7 years ago
  rallytime e90622bc22 Merge branch '2016.11' into 'nitrogen' 7 years ago
  Daniel Wallace a86b101ae6 add retries on authentications of the salt minion reconnecting 7 years ago
  Nicole Thomas 8809d33674 Merge pull request #39701 from rallytime/merge-develop 7 years ago
  rallytime b4366103a6 Merge branch '2016.11' into 'develop' 7 years ago
  Mike Place cbd66a0d3f Merge pull request #39676 from F30/hash-comment 7 years ago
  Felix Dreissig 5371bc0996 Fix comments about the "hash_type" option 7 years ago
  Felix Dreissig 78a185ab11 Fix comments about file backup directory 7 years ago
  Mike Place 1dba2f9cb0 Add warning in docs 7 years ago
  Erik Johnson 591b9ed9c4 Add pillarenv_from_saltenv to example minion config file 8 years ago
  rallytime efb8a8ddf5 Merge branch '2016.3' into '2016.11' 8 years ago
  David Boucha 11863a4bfe add examples of default minion returners 8 years ago
  Dmitry Kuzmenko 0c607ccaec An example configuration for TLS/SSL. (#37859) 8 years ago
  rallytime 7f955bda0a Merge branch '2015.8' into '2016.3' 8 years ago
  Nicole Thomas 7cdbc546f1 Back-port #36062 to 2015.8 (#36118) 8 years ago
  rallytime 9828a0dbfa Comment all lines in the minion config file 8 years ago
  C. R. Oldham 908234d9ab Document module whitelisting. Remove FIXME comments for disable_modules and disable_returners as they are definitely implemented. (#35717) 8 years ago
  Mike Place 69b44bc6f8 Merge pull request #35500 from rallytime/fix-35068 8 years ago
  rallytime cface344d6 Add docs for pillar_raise_on_missing option 8 years ago
  rallytime de4b33f2e1 Merge branch '2016.3' into 'develop' 8 years ago
  Jeffrey 'jf' Lim c61c8a27e5 Update instructions for getting master fingerprint in conf/minion 8 years ago
  C. R. Oldham 84cc7d67c0 Add documentation for append_minionid_config_dirs. 8 years ago
  Nicole Thomas 08a584b3e5 Merge pull request #33711 from rallytime/merge-develop-3 8 years ago