rallytime 80fcdfb9d8 Merge branch '2015.8' into '2016.3' ... Conflicts: - doc/topics/targeting/grains.rst - salt/cli/daemons.py - salt/exceptions.py - salt/minion.py - salt/modules/schedule.py - salt/scripts.py - salt/states/archive.py		2016-04-26 12:07:42 -06:00
..
cloud.maps.d	Fixing up salt-cloud sample configs	2013-11-20 08:48:01 -07:00
cloud.profiles.d	Remove trailing white spaces in conf dir file	2016-03-01 17:35:34 +02: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	Remove trailing white spaces in conf dir file	2016-03-01 17:35:34 +02: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	Merge branch '2015.8' into '2016.3'	2016-04-26 12:07:42 -06:00
minion	Back-port #29322 to 2015.8 (#32785)	2016-04-25 10:46:37 -06:00
proxy	Documentation updates that go with PR #32252.	2016-03-31 10:41:24 -06:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00