salt/doc/ref/states
Mike Place 13d544b675 Adding some dictupdate merge tests
Add new option for top_file_merging_strategy to config

Add master config file option

Adding additional tests

Lexicographical test works

Make default strategy

Simplify to just an option about whether or not to merge

Changes

Implement ordered top files

Implement merge strategies and default top files

Lint

Doc rewrite and start on ordering

Remove debugging

Moving to env_order

Adding env_order

Still writing tests

More tests and docs
2015-08-07 10:43:19 -06:00
..
all Add missing module docs 2015-08-04 16:33:37 -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 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 Fix typo in extend declaration doco 2015-07-18 14:39:29 +10:00
include.rst Fix doc around Include/Exclude for states 2015-07-24 09:42:25 +10: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 Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-16 20:08:28 +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 Adding some dictupdate merge tests 2015-08-07 10:43:19 -06: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