Colton Myers c1e630340e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: salt/fileserver/gitfs.py salt/grains/core.py		2015-01-22 16:46:32 -07:00
..
cloud_controller.rst	Merge branch '2014.7' into develop	2014-12-23 10:57:26 -07:00
cron.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
esky.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
firewall.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
gitfs.rst	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-01-22 16:46:32 -07:00
halite.rst	Comma cleanup	2014-12-12 11:32:58 -08:00
http.rst	Update HTTP tutorial for new functionality	2015-01-21 09:20:11 -07:00
index.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
intro_scale.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
minionfs.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
modules.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
multimaster_pki.rst	Merge branch '2014.7' into develop	2014-12-17 15:00:26 -07:00
multimaster.rst	Comma cleanup	2014-12-12 11:32:58 -08:00
pillar.rst	Merge branch '2014.7' into merge-forward	2014-12-16 14:45:25 -07:00
preseed_key.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
quickstart.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
salt_bootstrap.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
standalone_minion.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
starting_states.rst	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-01-20 15:19:53 -07:00
states_pt1.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
states_pt2.rst	Merge branch '2014.7' into merge-forward	2014-12-16 14:45:25 -07:00
states_pt3.rst	Merge branch '2014.7' into merge-forward	2014-12-16 14:45:25 -07:00
states_pt4.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
states_pt5.rst	Comma cleanup	2014-12-12 11:32:58 -08:00
syslog_ng-state-usage.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
walkthrough_macosx.rst	Comma cleanup	2014-12-12 11:32:58 -08:00
walkthrough.rst	Merge branch '2014.7' into merge-forward	2014-12-16 14:45:25 -07:00
writing_tests.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00