rallytime 24505d2dcf Merge branch '2015.5' into '2015.8' ... Conflicts: - salt/client/ssh/state.py - salt/fileclient.py - salt/minion.py		2016-02-29 10:47:40 -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	2016-01-05 16:11:20 -07:00
roster.rst	Merge branch '2015.5' into '2015.8'	2016-02-29 10:47:40 -07:00