Colton Myers fc16bd16c0 Merge branch '2014.7' into merge-forward ... Conflicts: doc/faq.rst doc/ref/states/compiler_ordering.rst doc/topics/best_practices.rst doc/topics/development/conventions/formulas.rst salt/config.py salt/modules/state.py salt/states/mount.py salt/utils/event.py tests/unit/utils/process_test.py		2014-12-16 14:45:25 -07:00
..
all	Whitespace cleanup	2014-12-11 07:53:19 -08:00
aggregate.rst	Comma cleanup	2014-12-12 11:34:51 -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	Whitespace cleanup	2014-12-11 07:53:19 -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 branch '2014.7' into merge-forward	2014-12-16 14:45:25 -07: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	Comma cleanup	2014-12-12 11:34:51 -08:00