3cb3a7cd30
Conflicts: provisioner/salt-masterless/provisioner.go website/source/docs/provisioners/salt.html.markdown |
||
---|---|---|
.. | ||
custom.html.markdown | ||
file.html.markdown | ||
salt-masterless.html.markdown | ||
salt.html.markdown | ||
shell.html.markdown |