Colton Myers 73b90f155e Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/topics/cloud/gce.rst doc/topics/windows/windows-package-manager.rst salt/client/ssh/state.py salt/cloud/clouds/ec2.py salt/modules/defaults.py salt/modules/file.py salt/utils/cloud.py		2015-09-29 14:56:41 -06: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-09-29 14:56:41 -06:00
roster.rst	Document tty: True usage in salt-ssh roster file	2015-09-24 16:25:22 -06:00