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
..
conventions	Merge branch '2014.7' into merge-forward	2014-12-16 14:45:25 -07:00
git	Whitespace cleanup	2014-12-11 07:53:19 -08:00
raet	Whitespace cleanup	2014-12-11 07:53:19 -08:00
tests	Comma cleanup	2014-12-12 11:39:40 -08:00
architecture.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
contributing.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
deprecations.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
dunder_dictionaries.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
external_pillars.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
hacking.rst	Comma cleanup	2014-12-12 11:39:40 -08:00
index.rst	Merge conflict and rebase.	2014-02-26 13:32:08 -07:00
logging.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
modular_systems.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
package_providers.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
salt_projects.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
topology.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
translating.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00