Re-arrange directory structure for merge.

6 years ago · ffcae91e8e
parent 4ec004e18e
commit ffcae91e8e
80 changed files with 0 additions and 0 deletions
--- a/builder/vsphere/.gitignore
+++ b/builder/vsphere/.gitignore
--- a/builder/vsphere/LICENSE.txt
+++ b/builder/vsphere/LICENSE.txt
--- a/builder/vsphere/Makefile
+++ b/builder/vsphere/Makefile
--- a/builder/vsphere/README.md
+++ b/builder/vsphere/README.md
--- a/builder/vsphere/clone/builder.go
+++ b/builder/vsphere/clone/builder.go
--- a/builder/vsphere/clone/builder_acc_test.go
+++ b/builder/vsphere/clone/builder_acc_test.go
--- a/builder/vsphere/clone/builder_test.go
+++ b/builder/vsphere/clone/builder_test.go
--- a/builder/vsphere/clone/config.go
+++ b/builder/vsphere/clone/config.go
--- a/builder/vsphere/clone/config_test.go
+++ b/builder/vsphere/clone/config_test.go
--- a/builder/vsphere/clone/leak_test.go
+++ b/builder/vsphere/clone/leak_test.go
--- a/builder/vsphere/clone/step_clone.go
+++ b/builder/vsphere/clone/step_clone.go
--- a/builder/vsphere/cmd/clone/main.go
+++ b/builder/vsphere/cmd/clone/main.go
--- a/builder/vsphere/cmd/iso/main.go
+++ b/builder/vsphere/cmd/iso/main.go
--- a/builder/vsphere/common/artifact.go
+++ b/builder/vsphere/common/artifact.go
--- a/builder/vsphere/common/config_location.go
+++ b/builder/vsphere/common/config_location.go
--- a/builder/vsphere/common/config_ssh.go
+++ b/builder/vsphere/common/config_ssh.go
--- a/builder/vsphere/common/step_config_params.go
+++ b/builder/vsphere/common/step_config_params.go
--- a/builder/vsphere/common/step_connect.go
+++ b/builder/vsphere/common/step_connect.go
--- a/builder/vsphere/common/step_hardware.go
+++ b/builder/vsphere/common/step_hardware.go
--- a/builder/vsphere/common/step_run.go
+++ b/builder/vsphere/common/step_run.go
--- a/builder/vsphere/common/step_shutdown.go
+++ b/builder/vsphere/common/step_shutdown.go
--- a/builder/vsphere/common/step_snapshot.go
+++ b/builder/vsphere/common/step_snapshot.go
--- a/builder/vsphere/common/step_template.go
+++ b/builder/vsphere/common/step_template.go
--- a/builder/vsphere/common/step_wait_for_ip.go
+++ b/builder/vsphere/common/step_wait_for_ip.go
--- a/builder/vsphere/common/testing/utility.go
+++ b/builder/vsphere/common/testing/utility.go
--- a/builder/vsphere/docker-compose.yml
+++ b/builder/vsphere/docker-compose.yml
--- a/builder/vsphere/driver/datastore.go
+++ b/builder/vsphere/driver/datastore.go
--- a/builder/vsphere/driver/datastore_acc_test.go
+++ b/builder/vsphere/driver/datastore_acc_test.go
--- a/builder/vsphere/driver/driver.go
+++ b/builder/vsphere/driver/driver.go
--- a/builder/vsphere/driver/driver_test.go
+++ b/builder/vsphere/driver/driver_test.go
--- a/builder/vsphere/driver/folder.go
+++ b/builder/vsphere/driver/folder.go
--- a/builder/vsphere/driver/folder_acc_test.go
+++ b/builder/vsphere/driver/folder_acc_test.go
--- a/builder/vsphere/driver/host.go
+++ b/builder/vsphere/driver/host.go
--- a/builder/vsphere/driver/host_acc_test.go
+++ b/builder/vsphere/driver/host_acc_test.go
--- a/builder/vsphere/driver/leak_test.go
+++ b/builder/vsphere/driver/leak_test.go
--- a/builder/vsphere/driver/network.go
+++ b/builder/vsphere/driver/network.go
--- a/builder/vsphere/driver/resource_pool.go
+++ b/builder/vsphere/driver/resource_pool.go
--- a/builder/vsphere/driver/resource_pool_acc_test.go
+++ b/builder/vsphere/driver/resource_pool_acc_test.go
--- a/builder/vsphere/driver/vm.go
+++ b/builder/vsphere/driver/vm.go
--- a/builder/vsphere/driver/vm_cdrom.go
+++ b/builder/vsphere/driver/vm_cdrom.go
--- a/builder/vsphere/driver/vm_clone_acc_test.go
+++ b/builder/vsphere/driver/vm_clone_acc_test.go
--- a/builder/vsphere/driver/vm_create_acc_test.go
+++ b/builder/vsphere/driver/vm_create_acc_test.go
--- a/builder/vsphere/driver/vm_keyboard.go
+++ b/builder/vsphere/driver/vm_keyboard.go
--- a/builder/vsphere/examples/alpine/alpine-3.8.json
+++ b/builder/vsphere/examples/alpine/alpine-3.8.json
--- a/builder/vsphere/examples/alpine/answerfile
+++ b/builder/vsphere/examples/alpine/answerfile
--- a/builder/vsphere/examples/alpine/setup.sh
+++ b/builder/vsphere/examples/alpine/setup.sh
--- a/builder/vsphere/examples/clone/alpine.json
+++ b/builder/vsphere/examples/clone/alpine.json
--- a/builder/vsphere/examples/driver/main.go
+++ b/builder/vsphere/examples/driver/main.go
--- a/builder/vsphere/examples/macos/macos-10.13.json
+++ b/builder/vsphere/examples/macos/macos-10.13.json
--- a/builder/vsphere/examples/macos/setup/.gitignore
+++ b/builder/vsphere/examples/macos/setup/.gitignore
--- a/builder/vsphere/examples/macos/setup/iso-macos.sh
+++ b/builder/vsphere/examples/macos/setup/iso-macos.sh
--- a/builder/vsphere/examples/macos/setup/iso-setup.sh
+++ b/builder/vsphere/examples/macos/setup/iso-setup.sh
--- a/builder/vsphere/examples/macos/setup/postinstall
+++ b/builder/vsphere/examples/macos/setup/postinstall
--- a/builder/vsphere/examples/macos/setup/setup.sh
+++ b/builder/vsphere/examples/macos/setup/setup.sh
--- a/builder/vsphere/examples/ubuntu/preseed.cfg
+++ b/builder/vsphere/examples/ubuntu/preseed.cfg
--- a/builder/vsphere/examples/ubuntu/ubuntu-16.04.json
+++ b/builder/vsphere/examples/ubuntu/ubuntu-16.04.json
--- a/builder/vsphere/examples/windows/.gitattributes
+++ b/builder/vsphere/examples/windows/.gitattributes
--- a/builder/vsphere/examples/windows/setup/Autounattend.xml
+++ b/builder/vsphere/examples/windows/setup/Autounattend.xml
--- a/builder/vsphere/examples/windows/setup/setup.ps1
+++ b/builder/vsphere/examples/windows/setup/setup.ps1
--- a/builder/vsphere/examples/windows/setup/vmtools.cmd
+++ b/builder/vsphere/examples/windows/setup/vmtools.cmd
--- a/builder/vsphere/examples/windows/windows-10.json
+++ b/builder/vsphere/examples/windows/windows-10.json
--- a/builder/vsphere/go.mod
+++ b/builder/vsphere/go.mod
--- a/builder/vsphere/go.sum
+++ b/builder/vsphere/go.sum
--- a/builder/vsphere/gofmt.sh
+++ b/builder/vsphere/gofmt.sh
--- a/builder/vsphere/iso/builder.go
+++ b/builder/vsphere/iso/builder.go
--- a/builder/vsphere/iso/builder_acc_test.go
+++ b/builder/vsphere/iso/builder_acc_test.go
--- a/builder/vsphere/iso/config.go
+++ b/builder/vsphere/iso/config.go
--- a/builder/vsphere/iso/leak_test.go
+++ b/builder/vsphere/iso/leak_test.go
--- a/builder/vsphere/iso/step_add_cdrom.go
+++ b/builder/vsphere/iso/step_add_cdrom.go
--- a/builder/vsphere/iso/step_add_floppy.go
+++ b/builder/vsphere/iso/step_add_floppy.go
--- a/builder/vsphere/iso/step_boot_command.go
+++ b/builder/vsphere/iso/step_boot_command.go
--- a/builder/vsphere/iso/step_create.go
+++ b/builder/vsphere/iso/step_create.go
--- a/builder/vsphere/iso/step_remote_upload.go
+++ b/builder/vsphere/iso/step_remote_upload.go
--- a/builder/vsphere/iso/step_remove_cdrom.go
+++ b/builder/vsphere/iso/step_remove_cdrom.go
--- a/builder/vsphere/iso/step_remove_floppy.go
+++ b/builder/vsphere/iso/step_remove_floppy.go
--- a/builder/vsphere/teamcity-services.yml
+++ b/builder/vsphere/teamcity-services.yml
--- a/builder/vsphere/test/lab.ovpn
+++ b/builder/vsphere/test/lab.ovpn
--- a/builder/vsphere/test/lab.p12
+++ b/builder/vsphere/test/lab.p12
--- a/builder/vsphere/test/test-key.pem
+++ b/builder/vsphere/test/test-key.pem
--- a/builder/vsphere/test/test-key.pub
+++ b/builder/vsphere/test/test-key.pub