 Sean Jenkins
|
9665d9655f
Set (pillar_)merge_lists to default for PR#30062
|
9 years ago |
|
Sean Jenkins
|
e44a30620b
Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead
|
9 years ago |
|
Colton Myers
|
17b919e9ec
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
|
9 years ago |
|
Jacob Hammons
|
44ce704206
Updated `zmq_monitor` docs
|
9 years ago |
|
Jacob Hammons
|
0d2111d397
Assorted doc bug fixes
|
9 years ago |
|
Sean Jenkins
|
8fc656b6f2
Set (pillar_)merge_lists to default for PR#30062
|
9 years ago |
|
Sean Jenkins
|
1d7ee7bed2
Merge remote-tracking branch 'origin/develop' into sean
|
9 years ago |
|
rallytime
|
c386d70742
Merge branch '2015.8' into 'develop'
|
9 years ago |
|
Sean Jenkins
|
41353b7ab3
Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead
|
9 years ago |
|
Jonathan Ballet
|
6922da46dc
doc: fix warnings + some rendering issues
|
9 years ago |
|
rallytime
|
d31b0d1573
Merge branch '2015.8' into develop
|
9 years ago |
|
Benjamin Drung
|
89dcb66310
Fix the wrong "allow to do" phrase
|
9 years ago |
|
Dmitry Kuzmenko
|
7a5204ef02
Deprecate client_acl with publisher_acl (rename)
|
9 years ago |
|
Domingo Kiser
|
4af5b5c33f
introduce recurse_list pillar_source_merging_strategy
|
9 years ago |
|
Domingo Kiser
|
a8adaa8f9e
introduce recurse_list pillar_source_merging_strategy
|
9 years ago |
|
Jacob Hammons
|
5a9867aad1
initial engines topic, updates to windows repo docs
|
9 years ago |
|
Colton Myers
|
95e70f0bef
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
|
9 years ago |
|
Colton Myers
|
7b75e4aed1
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
|
9 years ago |
|
Justin Findlay
|
3d28307a00
2014.7 -> 2014.7.0
|
9 years ago |
|
Erik Johnson
|
fb46a6cbda
Rename ref anchor
|
9 years ago |
|
Erik Johnson
|
9c155e0c1a
Add warning about file.recurse unicode errors with vim swap files.
|
9 years ago |
|
Erik Johnson
|
7ed679ad60
Add new winrepo config params to master config docs
|
9 years ago |
|
Colton Myers
|
f4cb659a2a
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
|
9 years ago |
|
Jacob Hammons
|
ac0a8ff711
Doc on using syndic with multimaster
|
9 years ago |
|
Jacob Hammons
|
3f3db4bd8e
Additions for #24042
|
9 years ago |
|
Jacob Hammons
|
db2129b199
Minor doc bug fixes
|
9 years ago |
|
Justin Findlay
|
d73964ea3c
add console_log_fmt color documentation
|
9 years ago |
|
Erik Johnson
|
a2fc11ef57
Add new git_pillar configuration docs
|
9 years ago |
|
Colton Myers
|
a5c9681672
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
|
9 years ago |
|
Jacob Hammons
|
c7cdd416a2
Doc bug fixes
|
9 years ago |
