Commit History

Author SHA1 Message Date
  rallytime 43c39e7408 Add documentation to master config docs for job_cache_store_endtime 6 years ago
  rallytime 887cd070ca Add some salt-api options to the master config docs 6 years ago
  rallytime 0d49746de8 Fix some formatting in master config docs 6 years ago
  rallytime 82e73fe49d Merge branch '2018.3' into 'fluorine' 6 years ago
  Daniel Wallace 4c4bb5a489 Merge pull request #49987 from terminalmage/pillar_roots 6 years ago
  rallytime f8e73e8ae2 Merge branch '2017.7' into '2018.3' 6 years ago
  Erik Johnson 58f5fde03c Make Pillar no longer munge file_roots 6 years ago
  rallytime 216fd64013 Remove event_publisher_pub_hwm and salt_event_pub_hwm from documentation 6 years ago
  rallytime 0c8b412556 Merge branch '2018.3' into 'fluorine' 6 years ago
  rallytime f7226f400f Merge branch '2017.7' into '2018.3' 6 years ago
  Erik Johnson ea1b53cb6f Fix incorrect master docs for enable_gpu_grains 6 years ago
  Erik Johnson d1b7fb449c Revert "Update documentation to correctly state enable_gpu_grains default" 6 years ago
  rallytime da3a29c680 Merge branch '2018.3' into 'fluorine' 6 years ago
  rallytime c3ecefc785 Merge branch '2017.7' into '2018.3' 6 years ago
  Mike Place f8c55b85e1 Merge pull request #49184 from ralish/external_nodes_docs 6 years ago
  Samuel D. Leslie 2fe675cfdd Update documentation to correctly state enable_gpu_grains default 6 years ago
  Samuel D. Leslie 2e29b292bf Remove obsolete documentation on external_nodes setting 6 years ago
  rallytime 6e6091c3ba Merge branch '2018.3' into 'fluorine' 6 years ago
  rallytime 201031fa8a Merge branch '2017.7' into '2018.3' 6 years ago
  Erik Johnson 0728b5f8b6 Add note about Python 3.5+ only support for optimization_order 6 years ago
  Erik Johnson fbcd142ea2 Add configuration docs for optimization_order config option 6 years ago
  rallytime a8b30fed9f Merge branch '2018.3' into 'develop' 6 years ago
  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