Colton Myers a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: doc/topics/releases/version_numbers.rst salt/cli/batch.py salt/minion.py salt/state.py setup.py		2015-06-18 11:43:11 -06:00
..
all	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-18 11:43:11 -06: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	Merge branch '2014.7' into merge-forward	2014-12-16 14:45:25 -07: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	Merge branch '2014.7' into merge-forward	2014-12-16 14:45:25 -07:00
include.rst	Quick note on usability of 'include' statement.	2015-05-20 10:46:03 -04:00
index.rst	Add external anchor for "reloading modules" section of state docs	2015-04-16 20:17:25 -05:00
layers.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
master_side.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
ordering.rst	Merge branch '2014.7' into merge-forward	2014-12-16 14:45:25 -07:00
overstate.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
providers.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
requisites.rst	Multiple onchanges requisite behaviour	2015-06-16 15:02:11 +01:00
startup.rst	Comma cleanup	2014-12-12 11:34:51 -08:00
testing.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
top.rst	Add details to first line.	2015-05-11 12:24:15 -07:00
vars.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
writing.rst	Improves example illustrating SLS-to-Python mapping	2015-03-30 14:04:05 -05:00