Commit History

Author SHA1 Message Date
  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
  rallytime 3d0d9110ac Merge branch '2017.7' into 'develop' 7 years ago
  rallytime bcbe180fbc Merge branch '2016.11' into '2017.7' 7 years ago
  Denys Havrysh 330d989b46 Import util modules on Master like it works on Minion 7 years ago
  Denys Havrysh af743ff6c3 [DOCS] Add missing `utils` sub-dir listed for `extension_modules` 7 years ago
  Corvin Mcpherson 2dc593b48e Add jinja environment default options. 7 years ago
  Corvin Mcpherson 23e1b23925 Change jinja line statement and line comment prefix default to '' instead of None 7 years ago
  Corvin Mcpherson eb713c699f Add jinja line statement and line comment options to master config. 7 years ago
  Sigmon, Jeffrey bb29afd022 Passphrase protect master private key 7 years ago
  rallytime 1f0b90aa57 Merge branch '2017.7' into 'develop' 7 years ago
  rallytime c673b64583 Merge branch '2016.11' into '2017.7' 7 years ago
  rallytime b40f980632 Add more documentation for config options that are missing from master/minion docs 7 years ago
  rallytime e512a29f08 Merge branch '2017.7' into 'develop' 7 years ago
  rallytime 2cfabc467c Merge branch '2016.11' into '2017.7' 7 years ago
  rallytime add5b118a3 Merge branch '2017.7' into 'develop' 7 years ago
  rallytime 58262608cd Merge branch '2016.11' into '2017.7' 7 years ago
  rallytime c828ad803a Add a bunch of config options to the various master/minion files that are missing 7 years ago
  rallytime 89834e49c2 Merge branch '2016.3' into '2016.11' 7 years ago
  C. R. Oldham dadf4b851c Add documentation to the example master and minion configuration files. 7 years ago
  Felix Dreissig 5b55fb2452 Fix comments about the "hash_type" option 7 years ago
  Mike Place 3031a01266 Merge pull request #41021 from MTecknology/develop 7 years ago
  rallytime 319dc45c1d Merge branch 'nitrogen' into 'develop' 7 years ago