Colton Myers f4cb659a2a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/topics/windows/windows-package-manager.rst salt/modules/event.py salt/returners/carbon_return.py salt/state.py salt/states/pkg.py		2015-08-03 14:50:50 -06:00
..
cloud.maps.d	Fixing up salt-cloud sample configs	2013-11-20 08:48:01 -07:00
cloud.profiles.d	Get rid of Micro Instance examples	2014-09-27 11:09:08 -06:00
cloud.providers.d	Add more URL clarifications	2014-08-07 16:25:14 -06:00
cloud	add console_log_fmt color documentation	2015-07-28 16:16:29 -06:00
cloud.profiles	Get rid of Micro Instance examples	2014-09-27 11:09:08 -06:00
cloud.providers	Chmod files back to original	2014-03-22 17:47:54 +01:00
master	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-08-03 14:50:50 -06:00
minion	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-07-30 16:54:44 -06:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00