Colton Myers 8a23181dd7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/modules/boto_secgroup.py salt/modules/rabbitmq.py salt/modules/win_system.py salt/modules/yumpkg.py salt/states/mount.py		2015-11-09 17:05:43 -07: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	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-17 10:54:33 -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	Deprecate client_acl with publisher_acl (rename)	2015-10-23 11:59:40 +03:00
minion	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-11-09 17:05:43 -07:00
proxy	Default configuration file for proxy minions.	2015-11-03 12:31:58 -07:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00