rallytime 4fa80f2d5e Merge branch '2015.8' into 'develop' ... Conflicts: - doc/ref/states/all/index.rst - salt/cloud/__init__.py - salt/minion.py - salt/modules/file.py - salt/modules/guestfs.py - salt/modules/ipmi.py - salt/modules/osquery.py - salt/modules/parted.py - salt/modules/seed.py - salt/modules/virt.py - salt/modules/yumpkg.py - salt/modules/zypper.py - salt/states/boto_elb.py - salt/states/pkg.py		2016-01-26 16:19:39 -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
esxi_proxy_minion.rst	Merge #30231 with updates to dependency documentation	2016-01-13 16:41:29 -07:00
firewall.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00
gitfs.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2016-01-05 16:11:20 -07: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-12-01 13:26:44 -07:00
index.rst	Added ESXi Proxy Minion Tutorial	2015-12-09 18:00:20 -07:00
intro_scale.rst	style and usage consistency in intro_scale	2015-07-30 01:11:22 -06:00
lxc.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-14 14:39:03 -06:00
minionfs.rst	Minor grammar changes to #28271	2015-10-26 06:15:19 -06: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	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-12-18 15:00:24 -07:00
pillar.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2016-01-06 09:30:28 -07: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	Merge branch '2015.8' into 'develop'	2016-01-26 16:19:39 -07:00
rooted.rst	Fix typo an dont -> don't	2015-11-04 10:59:22 +01:00
salt_bootstrap.rst	Remove the /etc/salt prefix	2015-09-08 17:26:48 +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	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-10-30 16:05:26 -06:00
states_pt3.rst	Assorted doc bugs	2015-10-05 17:37:13 -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 typo an other -> another	2015-11-04 10:59:22 +01:00
walkthrough_macosx.rst	Homebrew oneliner fix.	2015-11-17 22:30:51 -08:00
walkthrough.rst	Update service manager info for Debian	2015-12-09 08:49:02 +01:00
writing_tests.rst	Fix trailing whitespace	2014-12-11 07:53:19 -08:00