Resolved conflicts in plugins/provisioners/ansible/config.rb plugins/provisioners/ansible/provisioner.rb test/unit/plugins/provisioners/ansible/provisioner_test.rb website/docs/source/v2/provisioning/ansible.html.md ref #6348 |
||
---|---|---|
.. | ||
images | ||
javascripts | ||
layouts | ||
stylesheets | ||
v2 | ||
404.html.erb | ||
favicon.ico | ||
index.html.erb |