Commit History

Author SHA1 Message Date
  Erik Johnson 7dce7cde14 Explictly document the configuration override priority 6 years ago
  Doug Freed c3650eed03 Update presence_events docs to remove localhost comment 6 years ago
  Erik Johnson 04a80673a2 Clean up Sphinx build errors in develop branch 6 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
  pengyao 39cb55a666 Add docs for ssh_priv_passwd 6 years ago
  Erik Johnson 09dcb8ffce Merge pull request #47084 from bloomberg/26396-docpatch 6 years ago
  Matt Phillips 3755489e6b GH-26396, add a clarification on pillar merge strategy 6 years ago
  Erik Johnson 7070a3be48 Update default renderer to jinja|yaml, improve renderer docs 6 years ago
  rallytime 5b50eaf6b0 Merge branch '2018.3' into 'develop' 6 years ago
  rallytime e312efb5e7 Merge branch '2017.7' into '2018.3' 6 years ago
  rallytime 2c4668a5cb Merge branch '2018.3' into 'develop' 6 years ago
  Erik Johnson b4a1d34b47 Add option to return to pre-2017.7.3 pillar include merge order 6 years ago
  rallytime 8d1e1e7f94 Merge branch '2017.7' into '2018.3' 6 years ago
  rallytime 651dcaff66 Merge branch '2018.3' into 'develop' 6 years ago
  Benjamin Drung 3d37eca847 Fix various spelling mistakes 6 years ago
  Benjamin Drung a3c54b50f6 Fix various spelling mistakes 6 years ago
  rallytime ddbeef85cd Merge branch '2018.3' into 'develop' 6 years ago
  Erik Johnson 61ab47ee70 Merge branch '2017.7' into merge-2017.7-2018.3 6 years ago
  rallytime ed46ce3c74 Merge branch '2018.3' into 'develop' 6 years ago
  Erik Johnson b1ce2501fd Normalize global git_pillar/winrepo config items 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
  Nurono dd5fa715f8 Fix an inconsistency in the docs 6 years ago
  rallytime 60370f5fb6 Merge branch '2017.7' into 'oxygen' 6 years ago
  Erik Johnson ef76bc6fcd Update documentation for update intervals feature 7 years ago
  David Boucha a82e158f2d gate the minion data cache refresh events. 6 years ago
  Gareth J. Greenaway 9a15ec3430 Updating versionadded string. Fixing typo. 6 years ago