Colton Myers acb7c6f52b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: salt/minion.py salt/modules/network.py salt/utils/cloud.py salt/utils/job.py		2015-06-24 11:44:04 -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	clarify and expand console log colors help	2015-03-26 23:21:30 -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-develop	2015-06-16 15:13:53 -06:00
minion	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop	2015-06-24 11:44:04 -06:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00