Colton Myers 8d0bf0ee95 Merge branch '2014.7' into develop ... Conflicts: salt/states/pip_state.py		2014-09-15 11:49:04 -06:00
..
_includes	Remove remaining exsel code	2014-05-29 01:32:54 +01:00
index.rst	Added salt-api to CLI TOC	2014-06-20 10:20:58 -06:00
salt-api.rst	Docs cleanup	2014-07-13 11:02:33 -05:00
salt-call.rst	Docs cleanup	2014-07-13 11:02:33 -05:00
salt-cloud.rst	Change --list-profiles to accept an argument such as "linode" or "all"	2014-08-26 08:03:39 -06:00
salt-cp.rst	Docs cleanup	2014-07-13 11:02:33 -05:00
salt-key.rst	Docs cleanup	2014-07-13 11:02:33 -05:00
salt-master.rst	Docs cleanup	2014-07-13 11:02:33 -05:00
salt-minion.rst	Docs cleanup	2014-07-13 11:02:33 -05:00
salt-run.rst	Docs cleanup	2014-07-13 11:02:33 -05:00
salt-ssh.rst	Docs cleanup	2014-07-13 11:02:33 -05:00
salt-syndic.rst	Docs cleanup	2014-07-13 11:02:33 -05:00
salt-unity.rst	Added salt-unity manpages	2014-09-13 12:56:25 -06:00
salt.rst	show_timeouts, new default	2014-08-14 13:10:52 -04:00