Resolving merge conflicts

ESXi/Packer/ubuntu1804_esxi.json

@@ -45,6 +45,7 @@
             "ssh_password": "vagrant",
             "ssh_port": 22,
             "ssh_username": "vagrant",
+            "ssh_timeout": "10000s",
             "pause_before_connecting": "10m",
             "tools_upload_flavor": "linux",
             "type": "vmware-iso",

ESXi/ansible/roles/logger/tasks/main.yml

@@ -318,7 +318,6 @@
     sed -i 's/interval: 28800/interval: 900/g' osquery-configuration/Fleet/Endpoints/MacOS/osquery.yaml
     sed -i 's/interval: 28800/interval: 900/g' osquery-configuration/Fleet/Endpoints/Windows/osquery.yaml
 
-    # Dont log osquery INFO messages
     fleetctl get options > /tmp/options.yaml
     /usr/bin/yq w -i /tmp/options.yaml 'spec.config.options.logger_min_status' '1'
     fleetctl apply -f /tmp/options.yaml

Vagrant/scripts/install-choco-extras.ps1

@@ -10,7 +10,6 @@ If (-not (Test-Path "C:\ProgramData\chocolatey")) {
 }
 
 Write-Host "Installing Chocolatey extras..."
-choco install -y --limit-output --no-progress wireshark
-choco install -y --limit-output --no-progress winpcap
+choco install -y --limit-output --no-progress wireshark winpcap
 
 Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) Choco addons complete!"

Vagrant/scripts/install-utilities.ps1

@@ -14,8 +14,6 @@ If ($(hostname) -eq "win10") {
   choco install -y --limit-output --no-progress classic-shell -installArgs ADDLOCAL=ClassicStartMenu
   & "C:\Program Files\Classic Shell\ClassicStartMenu.exe" "-xml" "c:\vagrant\resources\windows\MenuSettings.xml"
 }
-choco install -y --limit-output --no-progress NotepadPlusPlus
-choco install -y --limit-output --no-progress GoogleChrome
-choco install -y --limit-output --no-progress WinRar
+choco install -y --limit-output --no-progress NotepadPlusPlus GoogleChrome WinRar
 
 Write-Host "Utilties installation complete!"