75395af12d
Conflicts: builder/parallels/common/step_upload_parallels_tools.go builder/vmware/common/step_upload_tools.go provisioner/chef-client/provisioner.go provisioner/chef-solo/provisioner.go |
||
---|---|---|
.. | ||
common | ||
iso | ||
vmx |