 rallytime
|
760f479424
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
rallytime
|
d7b4b8b081
Merge branch '2015.5' into '2015.8'
|
8 years ago |
|
rallytime
|
7e642b8381
Audit config.py default types and values - first sweep
|
8 years ago |
|
rallytime
|
fe7ff0ebfa
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
Imran Iqbal
|
e4df5d9a55
Fix typo in example for section `winrepo_dir_ng`
|
8 years ago |
|
Imran Iqbal
|
1f0b742052
Fix typo in example for section `winrepo_dir_ng`
|
8 years ago |
|
Kris Raney
|
0aa6334442
Merge branch 'develop' into kraney_bugfix
|
8 years ago |
|
rallytime
|
3b74d123af
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
Jacob Hammons
|
748acab8b5
Fixed zeromq casing in transport settings
|
8 years ago |
|
Kris Raney
|
afa297e4d1
Add pillar_roots_override_ext_pillar option and deprecate ext_pillar_first
|
8 years ago |
|
Jacob Hammons
|
765a226907
Fixed transport description in minion / master config
|
8 years ago |
|
Jacob Hammons
|
a72dc15720
Assorted doc issues
|
8 years ago |
|
rallytime
|
4baea26c58
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
Erik Johnson
|
eebc325040
Clarify documentation for gitfs/hgfs/svnfs mountpoint and root options
|
8 years ago |
|
Colton Myers
|
076b49a4ca
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3
|
8 years ago |
|
rallytime
|
742d0a6b04
Change all relevant Boron references to 2016.3.0
|
8 years ago |
|
Denys Havrysh
|
936c1ff6c8
Add explanation about `N@` classifier. Inspired by #25292
|
8 years ago |
|
Denys Havrysh
|
8bc2426816
Update example in master config documentation reference
|
8 years ago |
|
Erik Johnson
|
dcf5ed6369
Add information about change to extention_modules
|
8 years ago |
|
Sean Jenkins
|
9924acdc43
Fix documentation for pillar_merge_lists which default is False, not True. From PR #30062
|
8 years ago |
|
Sean Jenkins
|
841192ee2d
Fix documentation for pillar_merge_lists which default is False, not True. From PR #30062
|
8 years ago |
|
Jacob Hammons
|
2b7f96bf0e
Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron
|
8 years ago |
|
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 |
