Colton Myers 66378be75e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: doc/ref/states/requisites.rst salt/master.py salt/modules/win_pkg.py		2015-04-16 12:27:53 -06:00
..
all	Added autodoc generated pages for the new modules types	2015-04-03 12:45:49 -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	Update include.rst	2015-01-19 21:02:26 -08:00
index.rst	Merge branch '2014.7' into merge-forward	2014-12-16 14:45:25 -07: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	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-16 12:27:53 -06: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	Comma cleanup	2014-12-12 11:34:51 -08: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