rallytime 1b04f0ddec Merge branch '2015.5' into '2015.8' ... Conflicts: - doc/ref/configuration/minion.rst - doc/ref/modules/all/index.rst - doc/ref/modules/index.rst - salt/modules/systemd.py - salt/modules/zypper.py		2016-04-11 11:33:08 -06:00
..
all	Add glance state to list of state modules	2016-01-25 12:35:19 -07:00
aggregate.rst	Fix typos with the help of https://github.com/vlajos/misspell_fixer	2015-01-16 13:35:47 -08:00
altering_states.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
backup_mode.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
compiler_ordering.rst	Improve state module docs, replace references to state.highstate/state.sls with state.apply	2016-03-21 22:56:17 -05:00
extend.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
failhard.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
global_state_arguments.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
highstate.rst	Improve state module docs, replace references to state.highstate/state.sls with state.apply	2016-03-21 22:56:17 -05:00
include.rst	Merge branch '2015.5' into '2015.8'	2016-03-24 15:48:00 -06:00
index.rst	Merge branch '2015.5' into '2015.8'	2016-03-24 15:48:00 -06:00
layers.rst	Merge branch '2015.5' into '2015.8'	2016-03-24 15:48:00 -06:00
master_side.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
ordering.rst	documentation-fix-31931	2016-03-29 09:08:58 -06:00
providers.rst	Clarify the scope of the provider param in states.	2016-04-08 22:05:36 -05:00
requisites.rst	"Fire Event Notifications" moved down	2016-03-23 13:57:45 -06:00
startup.rst	Improve state module docs, replace references to state.highstate/state.sls with state.apply	2016-03-21 22:56:17 -05:00
testing.rst	Improve state module docs, replace references to state.highstate/state.sls with state.apply	2016-03-21 22:56:17 -05:00
top.rst	doc: minor fixes to doc and comments	2015-10-02 01:18:32 +02:00
vars.rst	documentation fix issue 31844	2016-03-29 09:11:29 -06:00
writing.rst	Merge branch '2015.5' into '2015.8'	2016-03-24 15:48:00 -06:00