 Erik Johnson
|
09dcb8ffce
Merge pull request #47084 from bloomberg/26396-docpatch
|
6 years ago |
|
Matt Phillips
|
3755489e6b
GH-26396, add a clarification on pillar merge strategy
|
6 years ago |
|
Erik Johnson
|
7070a3be48
Update default renderer to jinja|yaml, improve renderer docs
|
6 years ago |
|
rallytime
|
5b50eaf6b0
Merge branch '2018.3' into 'develop'
|
6 years ago |
|
rallytime
|
e312efb5e7
Merge branch '2017.7' into '2018.3'
|
6 years ago |
|
rallytime
|
2c4668a5cb
Merge branch '2018.3' into 'develop'
|
6 years ago |
|
Erik Johnson
|
b4a1d34b47
Add option to return to pre-2017.7.3 pillar include merge order
|
6 years ago |
|
rallytime
|
8d1e1e7f94
Merge branch '2017.7' into '2018.3'
|
6 years ago |
|
rallytime
|
651dcaff66
Merge branch '2018.3' into 'develop'
|
6 years ago |
|
Benjamin Drung
|
3d37eca847
Fix various spelling mistakes
|
6 years ago |
|
Benjamin Drung
|
a3c54b50f6
Fix various spelling mistakes
|
6 years ago |
|
rallytime
|
ddbeef85cd
Merge branch '2018.3' into 'develop'
|
6 years ago |
|
Erik Johnson
|
61ab47ee70
Merge branch '2017.7' into merge-2017.7-2018.3
|
6 years ago |
|
rallytime
|
ed46ce3c74
Merge branch '2018.3' into 'develop'
|
6 years ago |
|
Erik Johnson
|
b1ce2501fd
Normalize global git_pillar/winrepo config items
|
6 years ago |
|
mephi42
|
46996178e2
Allow configuring HTTP connect timeout
|
6 years ago |
|
Erik Johnson
|
1668a489c4
Update refrences to Oxygen codename to 2018.3.0
|
6 years ago |
|
Nurono
|
dd5fa715f8
Fix an inconsistency in the docs
|
6 years ago |
|
rallytime
|
60370f5fb6
Merge branch '2017.7' into 'oxygen'
|
6 years ago |
|
Erik Johnson
|
ef76bc6fcd
Update documentation for update intervals feature
|
7 years ago |
|
David Boucha
|
a82e158f2d
gate the minion data cache refresh events.
|
6 years ago |
|
Gareth J. Greenaway
|
9a15ec3430
Updating versionadded string. Fixing typo.
|
6 years ago |
|
Gareth J. Greenaway
|
edfc3dc078
Adding in documention for `auth_events` configuration option
|
6 years ago |
|
Daniel Wallace
|
262405b0e8
split out publishing to ssh minions
|
7 years ago |
|
Daniel Wallace
|
7d55924cf1
this makes this all work with syndics
|
7 years ago |
|
Daniel Wallace
|
b866c5f55d
fix option name
|
7 years ago |
|
Daniel Wallace
|
38aeb7ad5f
add enable_ssh documentation
|
7 years ago |
|
Tobias Jungel
|
de227769d6
document color_theme
|
7 years ago |
|
Benedikt Werner
|
5882a3c779
Fixed line length in docs
|
7 years ago |
|
Nicole Thomas
|
0697ed0645
Merge branch 'develop' into accept-minions-from-grains
|
7 years ago |
