Commit History

Author SHA1 Message Date
  Colton Myers 32f5345d7d Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 9 years ago
  Erik Johnson 157b1c8b11 Add masterless winrepo config params to minion config docs 9 years ago
  Jacob Hammons d220c83f77 master_finger configuration docs 9 years ago
  Colton Myers f4cb659a2a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 9 years ago
  Justin Findlay 7e121de907 Update minion.rst 9 years ago
  Colton Myers e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 9 years ago
  Justin Findlay d73964ea3c add console_log_fmt color documentation 9 years ago
  Mike Place 0dc28ad3e4 Return to `str` for master_type for 2015.5 9 years ago
  Colton Myers 76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 9 years ago
  Jeff Quast e947d8ec5a docfix: "cache_jobs: False" => grains_cache: False" 9 years ago
  Colton Myers 24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 9 years ago
  Justin Findlay 44cb167744 adding sudo_user minion config docs 9 years ago
  Colton Myers acb7c6f52b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 9 years ago
  C. R. Oldham 90c73ff446 References to documentation. 9 years ago
  Colton Myers a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 9 years ago
  Michael Steed f92a769d35 Remove doc references to obsolete minion opt 9 years ago
  Colton Myers 94d6ef1d17 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 9 years ago
  Jacob Hammons d45c4ed11f Bug fixes and build errors 9 years ago
  Colton Myers befb666623 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 9 years ago
  Colton Myers a18e017619 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 9 years ago
  Justin 8486e17ab3 Added retry_dns to minion doc. 9 years ago
  Thomas S Hatch 457ec179ae Add sudo user docs into salt 9 years ago
  Mike Place 3bc74501e4 Document many core opts 9 years ago
  dsumsky 6d797f50d4 - log_level_logfile and log_level configuration options inheritance docu updated 9 years ago
  Thomas Jackson da3ea213e9 Comma cleanup 10 years ago
  Nitin Madhok 5d8ae4e32f Fixing sphinx violations and errors 10 years ago
  vs 692252f41b Merge branch 'sreq_cache_option' into optional_sreq_caching 10 years ago
  Pedro Algarvio 229eb00e8d Merge branch '2014.7' forward into develop 10 years ago
  vs 2e1d3b07b8 add cache_sreqs option to minion documentation 10 years ago
  Erik Johnson 49c7e6ac1a Fix misspelled code-block type 10 years ago