Merge branch 'release-1.16'

joefitzgerald · May 7, 2014 · 18fb607 · 18fb607
2 parents 9276a71 + ea018db
commit 18fb607
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v1.16 (May 7th, 2014)
+
+* Fix VirtualBox ISO URLs
+
 ## v1.15 (May 7th, 2014)
 
 * Update Puppet to 3.5.1 (#54)

diff --git a/windows_2008_r2.json b/windows_2008_r2.json
@@ -31,7 +31,7 @@
         },
         {
             "type": "virtualbox-iso",
-            "iso_url": "http://care.dlservice.microsoft.com/dl/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
+            "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso",
             "iso_checksum_type": "md5",
             "iso_checksum": "4263be2cf3c59177c45085c0a7bc6ca5",
             "headless": true,

diff --git a/windows_2012.json b/windows_2012.json
@@ -31,7 +31,7 @@
         },
         {
             "type": "virtualbox-iso",
-            "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO",
+            "iso_url": "http://download.microsoft.com/download/6/D/A/6DAB58BA-F939-451D-9101-7DE07DC09C03/9200.16384.WIN8_RTM.120725-1247_X64FRE_SERVER_EVAL_EN-US-HRM_SSS_X64FREE_EN-US_DV5.ISO",
             "iso_checksum_type": "md5",
             "iso_checksum": "8503997171f731d9bd1cb0b0edc31f3d",
             "headless": true,

diff --git a/windows_2012_r2.json b/windows_2012_r2.json
@@ -31,7 +31,7 @@
         },
         {
             "type": "virtualbox-iso",
-            "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO",
+            "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO",
             "iso_checksum_type": "md5",
             "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
             "headless": true,

diff --git a/windows_2012_r2_core.json b/windows_2012_r2_core.json
@@ -31,7 +31,7 @@
         },
         {
             "type": "virtualbox-iso",
-            "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO",
+            "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_SERVER_EVAL_EN-US-IRM_SSS_X64FREE_EN-US_DV5.ISO",
             "iso_checksum_type": "md5",
             "iso_checksum": "458ff91f8abc21b75cb544744bf92e6a",
             "headless": true,

diff --git a/windows_7.json b/windows_7.json
@@ -2,7 +2,7 @@
     "builders": [
         {
             "type": "vmware-iso",
-            "iso_url": "http://download.microsoft.com/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso",
+            "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso",
             "iso_checksum_type": "md5",
             "iso_checksum": "1d0d239a252cb53e466d39e752b17c28",
             "headless": true,

diff --git a/windows_81.json b/windows_81.json
@@ -31,7 +31,7 @@
         },
         {
             "type": "virtualbox-iso",
-            "iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_ENTERPRISE_EVAL_EN-US-IRM_CENA_X64FREE_EN-US_DV5.ISO",
+            "iso_url": "http://download.microsoft.com/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_ENTERPRISE_EVAL_EN-US-IRM_CENA_X64FREE_EN-US_DV5.ISO",
             "iso_checksum_type": "md5",
             "iso_checksum": "5e4ecb86fd8619641f1d58f96e8561ec",
             "headless": true,