Colton Myers 17b919e9ec Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/topics/eauth/access_control.rst salt/modules/state.py salt/state.py salt/states/boto_secgroup.py tests/unit/modules/state_test.py		2016-01-07 16:36:40 -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	Set (pillar_)merge_lists to default for PR#30062	2016-01-06 09:55:20 -07:00
minion	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2016-01-07 16:36:40 -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