From 83a39b43e5a58f653fcb930b9b07c9d6c9c26f67 Mon Sep 17 00:00:00 2001
From: Joe Fitzgerald <jfitzgerald@gopivotal.com>
Date: Sat, 17 May 2014 22:28:52 -0600
Subject: [PATCH 1/4] Add Salt Batch File From @sherbang

---
 scripts/salt.bat | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 scripts/salt.bat

diff --git a/scripts/salt.bat b/scripts/salt.bat
new file mode 100644
index 00000000..1edddf65
--- /dev/null
+++ b/scripts/salt.bat
@@ -0,0 +1,11 @@
+if not exist "C:\Windows\Temp\salt64.exe" (
+  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://docs.saltstack.com/downloads/Salt-Minion-2014.1.3-1-AMD64-Setup.exe', 'C:\Windows\Temp\salt64.exe')" <NUL
+)
+
+:: http://docs.saltstack.com/en/latest/topics/installation/windows.html
+c:\windows\temp\salt64.exe /S
+:: /master=<yoursaltmaster> /minion-name=<thisminionname>
+
+<nul set /p ".=;C:\salt" >> C:\Windows\Temp\PATH
+set /p PATH=<C:\Windows\Temp\PATH
+setx PATH "%PATH%" /m

From 80a48c1b6361c7d67893c80681407f153841eca3 Mon Sep 17 00:00:00 2001
From: mikebayliss <mike.bayliss@gmail.com>
Date: Fri, 23 May 2014 08:45:03 +0200
Subject: [PATCH 2/4] issue #68

Add the microsoft-updates.bat script to the floppy image for windows 7
and 8
---
 windows_7.json  | 4 ++--
 windows_81.json | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/windows_7.json b/windows_7.json
index 072df8ac..73c507c5 100644
--- a/windows_7.json
+++ b/windows_7.json
@@ -18,7 +18,7 @@
       "vnc_port_max": 5980,
       "floppy_files": [
         "./answer_files/7/Autounattend.xml",
-        "./scripts/dis-updates.ps1",
+        "./scripts/microsoft-updates.bat",
         "./scripts/win-updates.ps1",
         "./scripts/openssh.ps1"
       ],
@@ -45,7 +45,7 @@
       "disk_size": 61440,
       "floppy_files": [
         "./answer_files/7/Autounattend.xml",
-        "./scripts/dis-updates.ps1",
+        "./scripts/microsoft-updates.bat",
         "./scripts/win-updates.ps1",
         "./scripts/openssh.ps1",
         "./scripts/oracle-cert.cer"
diff --git a/windows_81.json b/windows_81.json
index f3086f3c..037344a0 100644
--- a/windows_81.json
+++ b/windows_81.json
@@ -18,6 +18,7 @@
       "vnc_port_max": 5980,
       "floppy_files": [
         "./answer_files/81/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
         "./scripts/win-updates.ps1",
         "./scripts/openssh.ps1"
       ],
@@ -44,6 +45,7 @@
       "disk_size": 61440,
       "floppy_files": [
         "./answer_files/81/Autounattend.xml",
+        "./scripts/microsoft-updates.bat",
         "./scripts/win-updates.ps1",
         "./scripts/openssh.ps1",
         "./scripts/oracle-cert.cer"

From 933f1064e0e682f58ec939aee08b2aa53904613e Mon Sep 17 00:00:00 2001
From: Dylan Meissner <dylanmei@gmail.com>
Date: Mon, 14 Jul 2014 12:34:42 -0700
Subject: [PATCH 3/4] Update chocolatey scripts with 0.9.8.27's default install
 location.

---
 scripts/chocolatey.bat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/chocolatey.bat b/scripts/chocolatey.bat
index 0224fe75..2d6cda02 100644
--- a/scripts/chocolatey.bat
+++ b/scripts/chocolatey.bat
@@ -1,5 +1,5 @@
 powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" <NUL
 
-<nul set /p ".=;C:\Chocolatey\bin" >> C:\Windows\Temp\PATH
+<nul set /p ".=;%ALLUSERSPROFILE%\chocolatey\bin" >> C:\Windows\Temp\PATH
 set /p PATH=<C:\Windows\Temp\PATH
-setx PATH "%PATH%" /m
\ No newline at end of file
+setx PATH "%PATH%" /m

From 7772ac415af5f4672d850f038caae477e2baa707 Mon Sep 17 00:00:00 2001
From: Dylan Meissner <dylanmei@gmail.com>
Date: Mon, 21 Jul 2014 13:11:19 -0700
Subject: [PATCH 4/4] Update CHANGELOG for v1.20

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3514584a..0e750cca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## v1.20 (July 21st, 2014)
+
+* Update Chocolatey script for Chocolatey 0.9.8.27
+* Password for Vagrant user never expires
+* Salt installation script
+* Microsoft-updates.bat script for Win 7/8
+
 ## v1.19 (May 17th, 2014)
 
 * Enable Microsoft Updates by default (#60)
@@ -85,3 +92,4 @@
 ## v1.1 (December 17, 2013)
 
 * Initial release, including working Windows 2008 R2 configuration
+