Colton Myers e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: debian/changelog doc/man/salt.7 salt/cloud/__init__.py salt/cloud/clouds/proxmox.py salt/cloud/clouds/vmware.py salt/config.py salt/fileclient.py salt/minion.py salt/modules/chocolatey.py salt/modules/localemod.py salt/modules/pacman.py salt/modules/pkgng.py salt/modules/schedule.py salt/modules/state.py salt/modules/win_file.py salt/modules/win_pkg.py salt/state.py salt/states/file.py salt/utils/args.py tests/unit/states/file_test.py		2015-07-30 16:54:44 -06: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	Fixes for doc build errors	2015-05-27 11:40:31 -06:00
halite.rst	Deprecate Halite from the Salt docs	2015-05-05 16:01:35 -06:00
http.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-07-08 16:24:58 -06:00
index.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-05-29 17:33:28 -06:00
intro_scale.rst	style and usage consistency in intro_scale	2015-07-30 01:11:22 -06:00
lxc.rst	Merge pull request #24026 from jpic/fix/lxc_network_profile	2015-06-02 14:41:19 -06: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 debug from docs	2015-07-28 11:35:32 -06:00
multimaster.rst	Comma cleanup	2014-12-12 11:32:58 -08:00
pillar.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-09 11:41:07 -06: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	Update salt vagrant provisioner info	2015-05-27 21:56:29 -06:00
rooted.rst	Some fixes to #19161	2015-01-07 20:58:40 +00:00
salt_bootstrap.rst	Change Github to GitHub	2015-02-15 15:19:54 +01:00
standalone_minion.rst	Bug fixes and build errors	2015-06-05 17:32:35 -06:00
starting_states.rst	Fixes for doc build errors	2015-05-27 11:40:31 -06:00
states_pt1.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-09 11:41:07 -06:00
states_pt2.rst	update States Tutorial part 2	2014-12-23 16:20:42 -08:00
states_pt3.rst	Add extra clarification why jinja comments are needed.	2015-06-12 10:45:41 -06:00
states_pt4.rst	Resolve merge conflicts	2015-02-28 12:35:25 -06:00
states_pt5.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-07-14 10:57:36 -06:00
stormpath.rst	Updates to Stormpath as per Randall Degges	2015-04-22 15:59:09 -06:00
syslog_ng-state-usage.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
walkthrough_macosx.rst	broken link, adding /en/latest	2015-06-23 18:02:15 -07:00
walkthrough.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-18 11:43:11 -06:00
writing_tests.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00