rallytime 9064d3bbfb Merge branch '2015.5' into '2015.8' ... Conflicts: - salt/cloud/clouds/vmware.py - salt/modules/file.py - salt/states/archive.py		2016-04-25 15:45:17 -06:00
..
_includes	2015.8.8 release docs	2016-03-23 14:00:30 -06:00
index.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-10-07 12:06:12 -06:00
salt-api.rst	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-04-16 10:37:38 -06:00
salt-call.rst	Refs #24235	2015-06-10 09:45:03 -06:00
salt-cloud.rst	salt-cloud -u downloads stable version from bootstrap.saltstack.com by default (#32837)	2016-04-25 13:53:54 -06:00
salt-cp.rst	Fix typos of dependency	2015-11-04 10:58:40 +01:00
salt-key.rst	Audit config.py default types and values - first sweep	2016-03-31 13:50:51 -06:00
salt-master.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
salt-minion.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
salt-proxy.rst	Added rst source for salt-proxy man page, added build and copy lines for this man page to doc/conf.py and setup.py	2015-09-01 17:09:35 -06:00
salt-run.rst	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-04-16 10:37:38 -06:00
salt-ssh.rst	2015.8.8 release docs	2016-03-23 14:00:30 -06:00
salt-syndic.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
salt-unity.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
salt.rst	Change docs for --static option with JSON - text B	2015-07-27 09:00:59 -06:00
spm.rst	Added note regarding missing spm exe on Debian/Ubuntu	2015-10-21 22:34:45 -06:00