 Colton Myers
|
94d6ef1d17
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
|
9 years ago |
|
Jacob Hammons
|
d45c4ed11f
Bug fixes and build errors
|
9 years ago |
|
Colton Myers
|
ece63c36a3
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
|
9 years ago |
|
Colton Myers
|
1fb84450f4
Merge pull request #23396 from basepi/merge-forward-2015.2
|
9 years ago |
|
Erik Johnson
|
d395565bf7
Update Lithium docstrings in 2015.2 branch
|
9 years ago |
|
Colton Myers
|
2981aed48e
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
|
9 years ago |
|
Colton Myers
|
fd09cdae6f
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
|
9 years ago |
|
Colton Myers
|
cb69cd07de
Match the master config template in the master config reference
|
9 years ago |
|
Colton Myers
|
91dd9dcbdc
Add ssh_minion_opts to master config ref
|
9 years ago |
|
Steve Weber
|
97513b060a
include module_dirs
|
9 years ago |
|
Colton Myers
|
000de95974
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
|
9 years ago |
|
Thayne Harbaugh
|
6179839225
Improve documentation for nested nodegroup.
|
9 years ago |
|
Corin Kochenower
|
911345dd1a
Add versionadded label for event_return
|
9 years ago |
|
Mike Place
|
3bc74501e4
Document many core opts
|
9 years ago |
|
Colton Myers
|
0b7ac988cc
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
|
9 years ago |
|
Thomas S Hatch
|
d2e4ac840d
Merge pull request #22212 from ckochenower/2015.2
|
9 years ago |
|
Corin Kochenower
|
f44e25715a
Add detail for writing a returner
|
9 years ago |
|
Nicole Thomas
|
44c7eb4d4b
Merge pull request #22169 from basepi/merge-forward-develop
|
9 years ago |
|
Colton Myers
|
124ad51c40
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
|
9 years ago |
|
Elias Probst
|
c00c14f2be
Initial documentation improvements for pillar.pillar_ldap
|
10 years ago |
|
Colton Myers
|
7ba2404cc9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
|
9 years ago |
|
rallytime
|
73a0df18a8
There are 4 values, not 3.
|
9 years ago |
|
rallytime
|
c98118eb55
Update pillar_source_merging_strategy config doc spacing
|
9 years ago |
|
Godefroid Chapelle
|
ffe267a741
Specify valid values for gitfs_provider option
|
9 years ago |
|
Colton Myers
|
fd93491a5f
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
|
9 years ago |
|
Thomas S Hatch
|
cc9d294fcd
Merge pull request #21569 from basepi/merge-forward-2015.2
|
9 years ago |
|
rallytime
|
0171f68600
Use the full version for a versionadded tag
|
9 years ago |
|
Colton Myers
|
fec632ae18
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
|
9 years ago |
|
Colton Myers
|
ebe7eeafd9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
|
9 years ago |
|
Elias Probst
|
bc9a30b7e9
Typo (rendered → renderer)
|
9 years ago |
