Commit History

Author SHA1 Message Date
  C. R. Oldham 800113083b Add event_listen_queue_max_seconds to fix #53411 5 years ago
  rallytime 82e73fe49d Merge branch '2018.3' into 'fluorine' 6 years ago
  rallytime f8e73e8ae2 Merge branch '2017.7' into '2018.3' 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 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 8d3c2be61c Merge branch '2018.3' into 'develop' 6 years ago
  Daniel Wallace 8c5c780292 switch skip-roster to update-roster 6 years ago
  Dmitry Kuzmenko 6bcafcf30a Updated confusing docstring for tcp_pub/pull_port in conf examples 6 years ago
  Erik Johnson 7070a3be48 Update default renderer to jinja|yaml, improve renderer docs 6 years ago
  Arthur Lutz 7e5cbb4998 [conf/master] doc typo 6 years ago
  Nicole Thomas 0697ed0645 Merge branch 'develop' into accept-minions-from-grains 7 years ago
  Thomas S Hatch 4a808827c8 Add a default config entry to the master config 7 years ago
  Benedikt Werner 6900e6ece1 Merge branch 'develop' into accept-minions-from-grains 7 years ago
  Erik Johnson df972db3ba Merge pull request #42930 from CorvinM/issue36942 7 years ago
  Benedikt Werner d568c73c76 Prepend root dir config to autosign_grains_dir 7 years ago
  Benedikt Werner fbe4fa81d5 Added docs for autoaccepting grains 7 years ago
  Benedikt Werner 53dd162729 Fixed grammar 7 years ago
  Benedikt Werner 295b5d4834 Added tests and doc 7 years ago
  Ronald van Zantvoort e555b6351b doc fixes for salt-ssh roster(s) opts 7 years ago
  Corvin Mcpherson c67db52c73 Merge branch 'develop' into issue36942 7 years ago
  Corvin Mcpherson 19dcfcf1a0 Add jinja_env and jinja_sls_env master configuration options documentation 7 years ago
  Ronald van Zantvoort bfbca748e2 highstate output: Document additional output modes 7 years ago
  garethgreenaway 7091f8ec71 Merge branch 'develop' into issue36942 7 years ago