 Thomas S Hatch
|
c8facc5dae
these are no longer loaded by the loader and proved to be (#32548)
|
8 years ago |
|
Nicole Thomas
|
216d9fdc9a
[develop] Merge forward from 2016.3 to develop (#32494)
|
8 years ago |
|
rallytime
|
4f03f2311f
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
rallytime
|
1b04f0ddec
Merge branch '2015.5' into '2015.8'
|
8 years ago |
|
Erik Johnson
|
af24c82ab0
Add documentation on virtual module provider overrides to the module docs
|
8 years ago |
|
rallytime
|
f6d9cdc633
Merge branch '2015.8' into '2016.3'
|
8 years ago |
|
rallytime
|
7554d0f42d
Merge branch '2015.5' into '2015.8'
|
8 years ago |
|
Erik Johnson
|
1b97e4a3df
Improve state module docs, replace references to state.highstate/state.sls with state.apply
|
8 years ago |
|
Jacob Hammons
|
b192a9ba38
Doc restructuring, organization, and cleanup. Updated the doc navigation.
|
8 years ago |
|
rallytime
|
d31b0d1573
Merge branch '2015.8' into develop
|
9 years ago |
|
Benjamin Drung
|
8edd2c1add
Fix typos of dependency
|
9 years ago |
|
Colton Myers
|
9128e8e7ae
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
|
9 years ago |
|
Colton Myers
|
69d960f8e6
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
|
9 years ago |
|
Colton Myers
|
35425b14ad
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
|
9 years ago |
|
Justin Findlay
|
03400ef45b
fix virtual fcn return doc indentation
|
9 years ago |
|
Jacob Hammons
|
75cc07cf10
noted that __virtual__ can return False and an error string
|
9 years ago |
|
Jacob Hammons
|
b928e1afa8
update docs for __virtual__ and __virtualname__
|
9 years ago |
|
Justin Findlay
|
6bddf80546
update __virtual__ return documentation
|
9 years ago |
|
Colton Myers
|
9864d9e0fa
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
|
9 years ago |
|
Colton Myers
|
26b6c92975
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
|
9 years ago |
|
Colton Myers
|
2c2a5f85ac
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
|
9 years ago |
|
Jacob Hammons
|
6e323b6dd3
Update latest to 2015.8, 2015.5 is now previous
|
9 years ago |
|
Colton Myers
|
274464a85b
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
|
9 years ago |
|
Colton Myers
|
307d3d05a4
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
|
9 years ago |
|
Jacob Hammons
|
ac3bd47440
states/pkgrepo examples, suse installation updates
|
9 years ago |
|
Colton Myers
|
1e1f5f3a95
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
|
9 years ago |
|
Colton Myers
|
278e8dda5b
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
|
9 years ago |
|
Jacob Hammons
|
0ec036350d
Updates to salt-ssh and salt-key
|
9 years ago |
|
Jacob Hammons
|
06ac3bed42
Fixed typo
|
9 years ago |
|
Jacob Hammons
|
45c1ff3543
Add doc for __states__ to writing states topic and 2015.8 release notes. Also added a missing line in release notes for git module updates.
|
9 years ago |
