Commit History

Author SHA1 Message Date
  Jacob Hammons 146b4df6be Updates docs version to 2015.8.9 8 years ago
  rallytime bbec183474 Merge branch '2015.8' into '2016.3' 8 years ago
  C. R. Oldham 4242bc7399 Language clarification. 8 years ago
  C. R. Oldham 965e3bc1d1 Expand on the open-source vs open-core FAQ 8 years ago
  rallytime f6d9cdc633 Merge branch '2015.8' into '2016.3' 8 years ago
  rallytime 7554d0f42d Merge branch '2015.5' into '2015.8' 8 years ago
  Erik Johnson 1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply 8 years ago
  rallytime 39b49621ad Merge branch '2015.8' into 'develop' 9 years ago
  Erik Johnson 724b2f36ce Add file_tree/file.managed/contents_pillar example to FAQ 9 years ago
  Erik Johnson 854c7d9978 Remove old FAQ item referencing gitfs bug in 0.16.x 9 years ago
  Colton Myers a471832fa7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 9 years ago
  Colton Myers c4c889f97b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 9 years ago
  Jacob Hammons 2870af2ba3 added link to grains security FAQ to targeting and pillar topics. 9 years ago
  Colton Myers 9864d9e0fa Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 9 years ago
  Colton Myers 2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 9 years ago
  Jacob Hammons 6e323b6dd3 Update latest to 2015.8, 2015.5 is now previous 9 years ago
  Erik Johnson 656aec90b2 Fix wording of windows minion restart in FAQ 9 years ago
  Seth House dc6eac4f69 Deprecate Halite from the Salt docs 9 years ago
  Vynce Montgomery 80d6e9ec94 fix link to bug reporting in FAQ 9 years ago
  Peter Smith d836b2b3df Update faq.rst 9 years ago
  Mike Place 970c32ae8e Document the bug reporting procedure 9 years ago
  Colton Myers fc16bd16c0 Merge branch '2014.7' into merge-forward 10 years ago
  Seth House 51fa87c446 Change all state examples to use short-dec format for consistency 10 years ago
  Thomas Jackson f268bb8b4b Whitespace cleanup 10 years ago
  Michael Brown 9b39eae40c alternative way of restarting windows minion 10 years ago
  Colton Myers 716a7e3331 Merge branch '2014.7' into merge-forward 10 years ago
  Seth House daf0fe9937 Added nohup example to the FAQ about restarting Salt with Salt 10 years ago
  Thomas S Hatch bc7217c331 Add comment to clarify confusion in faqs 10 years ago
  Erik Johnson d9e036630a Fix weird merge forward in FAQ 10 years ago
  Thomas S Hatch 1468c26ec1 Merge branch '2014.7' into develop 10 years ago