Seth House
|
049975a1ca
Added versionadded for ext_pillar_first
|
9 years ago |
C. R. Oldham
|
f171df4311
Merge forward 2015.2->develop
|
9 years ago |
C. R. Oldham
|
00942f2060
Merge forward 2014.7->2015.2
|
9 years ago |
Seth House
|
4d974d9676
Improved presence docs; added cross-references and localhost caveat
|
9 years ago |
dsumsky
|
6d797f50d4
- log_level_logfile and log_level configuration options inheritance docu updated
|
9 years ago |
Thomas Jackson
|
da3ea213e9
Comma cleanup
|
10 years ago |
Thomas Jackson
|
f268bb8b4b
Whitespace cleanup
|
10 years ago |
Thomas S Hatch
|
3cf0cfb61d
Merge branch '2014.7' into develop
|
10 years ago |
Erik Johnson
|
13a92bde69
Add further clarification that gitfs auth is pygit2-only
|
10 years ago |
Pedro Algarvio
|
229eb00e8d
Merge branch '2014.7' forward into develop
|
10 years ago |
Erik Johnson
|
bb6de490ef
Grammar correction
|
10 years ago |
Mike Place
|
d0e90c77a6
Typo fix
|
10 years ago |
Mike Place
|
0fcc0b5ae7
Document pillar ovewrite strategy
|
10 years ago |
Mike Place
|
11ef20fdf5
Small doc fixes
|
10 years ago |
Chris Rebert
|
5ec98a7c4f
fix typos in doc/ref/configuration/master.rst
|
10 years ago |
Thomas Jackson
|
6225ae5145
Remove "never timeout" feature
|
10 years ago |
Thomas Jackson
|
2075fcde77
Update docs
|
10 years ago |
Thomas Jackson
|
4fac8f7d22
Add master_id to master docs
|
10 years ago |
vs
|
94948047cf
add rotate_aes_key documentation to master-configuration reference
|
10 years ago |
Thomas S Hatch
|
d88ceab872
Merge pull request #15917 from felskrone/fix_key_rotation
|
10 years ago |
vs
|
ae07fe381b
add documentation for the con_cache setting in master config
|
10 years ago |
vs
|
da78c38b97
add rotate_aes_key documentation to master-configuration reference
|
10 years ago |
Erik Johnson
|
13cc497b36
Fix sphinx build error
|
10 years ago |
Colton Myers
|
bb24131750
Merge branch '2014.7' into develop
|
10 years ago |
Thomas S Hatch
|
71c9bf4708
Add docs for roster_file option
|
10 years ago |
Nitin Madhok
|
0e61c4125d
Fixing sphinx violation and warning
|
10 years ago |
Mike Place
|
be60e25574
Merge branch '2014.7' into develop
|
10 years ago |
Erik Johnson
|
a3c62ef119
Add default value for fileserver_backend
|
10 years ago |
Erik Johnson
|
6e98ef828d
gitfs_provider has no default value
|
10 years ago |
Scott Coil
|
6770ce314e
add ability to target pillar from ext pillar
|
10 years ago |