Colton Myers 307d3d05a4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/man/salt.7 salt/modules/yumpkg.py		2015-09-03 14:24:45 -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-01 15:35:21 -06:00
roster.rst	Remove duplicate entry	2015-07-28 00:42:54 +01:00