Erik Johnson 175ba127be Merge branch '2014.7' into 2014.7-2015.2 ... Conflicts: salt/modules/archive.py		2015-01-14 14:26:22 -06:00
..
_includes	Whitespace cleanup	2014-12-11 07:53:20 -08:00
index.rst	Comma cleanup	2014-12-12 11:33:14 -08:00
salt-api.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
salt-call.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
salt-cloud.rst	Merge branch '2014.7' into 2014.7-2015.2	2015-01-14 14:26:22 -06:00
salt-cp.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
salt-key.rst	Whitespace cleanup	2014-12-11 07:53:20 -08: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-run.rst	Whitespace cleanup	2014-12-11 07:53:20 -08:00
salt-ssh.rst	Whitespace cleanup	2014-12-11 07:53:20 -08: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	Comma cleanup	2014-12-12 11:33:14 -08:00