rallytime
|
f6d9cdc633
|
Merge branch '2015.8' into '2016.3'
Conflicts:
- doc/ref/states/compiler_ordering.rst
- doc/topics/installation/suse.rst
- doc/topics/jobs/schedule.rst
- doc/topics/targeting/grains.rst
- doc/topics/tutorials/preseed_key.rst
- doc/topics/tutorials/states_pt5.rst
- pkg/suse/use-forking-daemon.patch
- salt/minion.py
- salt/modules/pacman.py
- salt/modules/state.py
- salt/modules/yumpkg.py
|
2016-03-25 11:47:16 -06:00 |
|
rallytime
|
7554d0f42d
|
Merge branch '2015.5' into '2015.8'
Conflicts:
- doc/ref/states/include.rst
- doc/topics/cloud/reactor.rst
- doc/topics/reactor/index.rst
- doc/topics/releases/2015.5.10.rst
- doc/topics/tutorials/states_pt5.rst
- doc/topics/windows/windows-package-manager.rst
- salt/config.py
- salt/modules/state.py
- salt/states/grains.py
- tests/integration/modules/sysmod.py
- tests/unit/states/grains_test.py
|
2016-03-24 15:48:00 -06:00 |
|
Erik Johnson
|
1b97e4a3df
|
Improve state module docs, replace references to state.highstate/state.sls with state.apply
Resolves #32037.
|
2016-03-21 22:56:17 -05:00 |
|
rallytime
|
33eb6ba125
|
Remove overstate docs and a few references.
The overstate system was deprecated and removed in Beryllium, in
favor of orchestrate.
|
2016-02-08 09:28:32 -07:00 |
|
Jacob Hammons
|
b192a9ba38
|
Doc restructuring, organization, and cleanup. Updated the doc navigation.
|
2016-01-31 20:10:02 -07:00 |
|
Colton Myers
|
2a144b954a
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
doc/ref/states/requisites.rst
doc/topics/tutorials/states_pt5.rst
salt/cloud/clouds/ec2.py
salt/config.py
salt/minion.py
salt/modules/cp.py
salt/pillar/__init__.py
salt/states/file.py
|
2015-07-14 10:57:36 -06:00 |
|
Justin Findlay
|
0447808d95
|
clarify, motivate orchestration docs
|
2015-07-10 17:03:27 -06:00 |
|
Mike Place
|
7dae045b3c
|
Remove overstate documentation
|
2015-06-12 13:00:08 -06:00 |
|
Thomas Jackson
|
c1860f3dd9
|
Comma cleanup
|
2014-12-12 11:32:58 -08:00 |
|
Thomas Jackson
|
c18e834be1
|
Fix trailing whitespace
Conflicts:
doc/topics/tutorials/states_pt2.rst
|
2014-12-11 07:53:19 -08:00 |
|
Colton Myers
|
426c97282e
|
Deprecating for Boron, not Beryllium
|
2014-11-18 16:39:01 -07:00 |
|
Colton Myers
|
c0f7756153
|
Reorganize orchestration doc and deprecate overstate runner
|
2014-11-18 16:31:36 -07:00 |
|
Thomas Jackson
|
9f7dac0674
|
Spelling fixes for docs
|
2014-10-28 08:12:27 -07:00 |
|
Daniel Wallace
|
4d8d2fa377
|
Document match for overstates
Uses compound matching. Closes #13659
|
2014-06-23 19:19:47 -05:00 |
|
Michael Lustfield
|
5eab3db366
|
minor doc touchups
|
2014-05-24 23:42:00 -05:00 |
|
Erik Johnson
|
fc062e5d27
|
Move OverState and state.sls docs to new location
|
2014-03-13 20:59:28 -05:00 |
|