Colton Myers 5ac96cc8ba Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/client/ssh/ssh_py_shim.py salt/modules/tls.py salt/states/git.py salt/transport/tcp.py		2015-12-14 15:56:26 -07:00
..
index.html	Updates to salt-ssh and salt-key	2015-08-31 20: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
roster.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-12-14 15:56:26 -07:00