Daniel Wozniak 82794696fb Merge branch 'master' into master %!s(int64=5) %!d(string=hai) anos
..
cloud.maps.d 832af68bad Make sure all sample config files in cloud.maps.d are commented out %!s(int64=8) %!d(string=hai) anos
cloud.profiles.d f1f1b84611 Make sure all sample config files in cloud.profiles.d are commented out %!s(int64=8) %!d(string=hai) anos
cloud.providers.d e11dca08ac Add Scaleway to cloud providers examples %!s(int64=6) %!d(string=hai) anos
suse 82e73fe49d Merge branch '2018.3' into 'fluorine' %!s(int64=6) %!d(string=hai) anos
cloud 733db23aec [conf/cloud] doc typo %!s(int64=6) %!d(string=hai) anos
cloud.profiles 14907e15d3 Make sure cont/cloud.profiles file is commented out %!s(int64=8) %!d(string=hai) anos
cloud.providers e11dca08ac Add Scaleway to cloud providers examples %!s(int64=6) %!d(string=hai) anos
master e74cbdf87d solves #54837 %!s(int64=5) %!d(string=hai) anos
minion 7db6705cca doc_ipc_mode_Windows_against_master %!s(int64=5) %!d(string=hai) anos
proxy 7070a3be48 Update default renderer to jinja|yaml, improve renderer docs %!s(int64=6) %!d(string=hai) anos
roster 1fa680d25c Added default config for salt-ssh %!s(int64=11) %!d(string=hai) anos