Colton Myers 1502a39779 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: conf/minion salt/client/__init__.py salt/states/dockerio.py salt/utils/event.py tests/unit/utils/event_test.py		2015-08-11 18:12:21 -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	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -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	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
master	Removed incorrect default config	2015-08-11 11:29:06 -06:00
minion	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-08-11 18:12:21 -06:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00