Commit History

Author SHA1 Message Date
  rallytime 6177d6e3c1 Merge branch '2018.3' into 'develop' 6 years ago
  rallytime 84ec655c24 Merge branch '2017.7' into '2018.3' 6 years ago
  Erik Johnson c5802ad465 Fix the version number in versionadded 6 years ago
  Erik Johnson 44c275698a Actually it's more than just add/remove that updates the mine 6 years ago
  Erik Johnson de05097b20 Add docs for new config option 6 years ago
  rallytime 0fcf4c54d1 Add no_proxy option to cont/minion docs and Fluorine release notes 6 years ago
  Brendan Beveridge 5f7aae3eef adjust doco 7 years ago
  Brendan Beveridge 6135c19a49 doc typo 7 years ago
  Brendan Beveridge cc85427724 add support for no_proxy for apt pkg and generic http util 7 years ago
  rallytime 7dc1e770c4 Merge branch '2018.3' into 'develop' 6 years ago
  Erik Johnson f89d2ccd30 Clean up Sphinx warnings 6 years ago
  rallytime 3273bbdab7 Merge branch '2017.7' into '2018.3' 6 years ago
  Erik Johnson 93ee5ee2b0 Fix all Sphinx warnings 6 years ago
  Éric Veiras Galisson 405c90aa76 Updating minion configuration doc 6 years ago
  rallytime 8d3c2be61c Merge branch '2018.3' into 'develop' 6 years ago
  Matei Albu 2f1485e067 Option to merge current pillar with opts['pillar'] during pillar compile 6 years ago
  Erik Johnson 7070a3be48 Update default renderer to jinja|yaml, improve renderer docs 6 years ago
  rallytime 2c4668a5cb Merge branch '2018.3' into 'develop' 6 years ago
  rallytime b03cda3cea Merge branch '2018.3.0rc1' into '2018.3' 6 years ago
  Nicole Thomas 20ed81f009 Fix typo 6 years ago
  Nicole Thomas 93ab582230 Small grammar fix to new grains settings 6 years ago
  twangboy 352eae3ffe Add configuration options to docs and release notes 6 years ago
  rallytime 651dcaff66 Merge branch '2018.3' into 'develop' 6 years ago
  David Boucha 391be5c06c Add docs for turning off extra startup msgs 6 years ago
  Benjamin Drung 3d37eca847 Fix various spelling mistakes 6 years ago
  rallytime ed46ce3c74 Merge branch '2018.3' into 'develop' 6 years ago
  mephi42 46996178e2 Allow configuring HTTP connect timeout 6 years ago
  Erik Johnson 1668a489c4 Update refrences to Oxygen codename to 2018.3.0 6 years ago
  rallytime 0ad101d560 Merge branch '2017.7' into 'oxygen' 6 years ago
  ddoh94 e474d0416b update winrepo_source_dir document 6 years ago