Thomas S Hatch
|
52ab561c4c
Add some extra docs
|
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 |
Mike Place
|
f2aa3539ef
Merge branch 'develop' into accept-minions-from-grains
|
7 years ago |
Nicole Thomas
|
9302149604
Merge branch 'develop' into develop
|
7 years ago |
Volodymyr Samodid
|
0c7f63e9d4
fix docstring errors during rendering
|
7 years ago |
Benedikt Werner
|
8f2693237c
Fixed and improved autoaccept grains docs
|
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
|
505b3e7b10
Added versionchanged tag
|
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
|
111df31057
Fix english error in jinja_sls_env documentation
|
7 years ago |
Corvin Mcpherson
|
470265ee03
Merge branch 'pr41538' 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
|
e0ae50e489
Merge branch '2017.7' into 'develop'
|
7 years ago |
Erik Johnson
|
20f6f3cc39
Include a better example for reactor in master conf file
|
7 years ago |
rallytime
|
3d0d9110ac
Merge branch '2017.7' into 'develop'
|
7 years ago |
rallytime
|
5901b10c14
Remove deprecated Legacy Git Pillar code
|
7 years ago |
rallytime
|
bcbe180fbc
Merge branch '2016.11' into '2017.7'
|
7 years ago |
Nicole Thomas
|
7c78a02df4
Merge branch 'develop' into issue36942
|
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 |
Kunal Bajpai
|
49a2d6d950
Add runner to sync eauth_token modules, fix masterapi daemon to use token module
|
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 |