Colton Myers 244c916b10 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: salt/modules/cron.py salt/states/npm.py		2015-02-06 15:41:21 -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	Don't default CA bundle updates to a non-standard location	2015-01-28 20:09:13 -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	Remove a documentation surprise	2015-01-14 15:28:40 -07:00
multimaster.rst	Comma cleanup	2014-12-12 11:32:58 -08:00
pillar.rst	How to store Minion config options on Pillars.	2015-02-02 09:27:13 -03:00
preseed_key.rst	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-02-06 13:00:14 -07:00
quickstart.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
rooted.rst	Some fixes to #19161	2015-01-07 20:58:40 +00: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/2015.2' into merge-forward-develop	2015-01-21 12:05:51 -07:00
states_pt1.rst	Update states_pt1.rst	2015-01-19 20:46:03 -08:00
states_pt2.rst	update States Tutorial part 2	2014-12-23 16:20:42 -08: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	DOC: topics/tutorials/walkthrough.rst: then > than	2015-02-03 05:42:50 -06:00
writing_tests.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00