Colton Myers 36ef47e7a2 Merge branch '2014.7' into develop ... Conflicts: conf/minion salt/modules/mine.py		2014-09-02 10:43:31 -06:00
..
conventions	Update formulas.rst	2014-08-12 13:18:48 -04:00
git	Merge conflict and rebase.	2014-02-26 13:32:08 -07:00
raet	Merge pull request #11431 from hulu/decript	2014-03-22 00:36:59 -06:00
tests	Replace all occurrences of "Digital Ocean" with "DigitalOcean"	2014-08-25 13:42:01 -06:00
contributing.rst	Merge branch '2014.7' into develop	2014-09-02 10:43:31 -06:00
deprecations.rst	Replace mentions of 0.18.0 with 2014.1.0	2014-02-14 17:01:57 -08:00
dunder_dictionaries.rst	more copyediting	2014-04-30 13:55:48 -07:00
external_pillars.rst	Add info about pillar refresh.	2014-08-25 10:56:55 -06:00
hacking.rst	Removed duplicate occurrences of the word "the"	2014-08-11 16:05:29 +02:00
index.rst	Merge conflict and rebase.	2014-02-26 13:32:08 -07:00
logging.rst	Minor updates to include the external logging handler documentation.	2013-08-30 23:14:40 +01:00
modular_systems.rst	Convert shell command examples to bash code-block	2013-08-10 21:55:51 -05:00
package_providers.rst	Fix refs to old pkg_resource.pack_pkgs	2013-10-25 12:47:45 -05:00
salt_projects.rst	added django-salted project to list of community projects in salt_projects.rst	2014-03-13 13:47:12 -05:00
topology.rst	First pass at refactoring Salt documentation.	2014-02-26 13:31:11 -07:00
translating.rst	First pass at refactoring Salt documentation.	2014-02-26 13:31:11 -07:00