From 452a27a145fa87b4b1f08d0fd46aa354ab9f8ea2 Mon Sep 17 00:00:00 2001
From: Marcus Griep <marcus@griep.us>
Date: Tue, 14 Jun 2016 18:18:12 -0400
Subject: [PATCH] Update Hashicorp tools: Terraform, Vagrant (#903)

* Bump Vagrant to 1.8.4

* Update terraform version check

Eliminates RC releases from consideration.

* Bump Terraform to 0.6.16

Adds providers for librato and softlayer.
---
 terraform.json | 14 ++++++++------
 vagrant.json   |  6 +++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/terraform.json b/terraform.json
index afa9838f1a..ded9c6f1f9 100644
--- a/terraform.json
+++ b/terraform.json
@@ -1,15 +1,15 @@
 {
     "homepage": "https://www.terraform.io",
     "license": "Mozilla Public License 2.0",
-    "version": "0.6.15",
+    "version": "0.6.16",
     "architecture": {
         "32bit": {
-            "url": "https://releases.hashicorp.com/terraform/0.6.15/terraform_0.6.15_windows_386.zip",
-            "hash": "e8d0dd1ce202ac80467333bc45f0bf2d7168d138871737db39868d6dc834305f"
+            "url": "https://releases.hashicorp.com/terraform/0.6.16/terraform_0.6.16_windows_386.zip",
+            "hash": "4032ee9f298005ee525aeef5c8763787f6867ab377367597083a39bb33a06ad5"
         },
         "64bit": {
-            "url": "https://releases.hashicorp.com/terraform/0.6.15/terraform_0.6.15_windows_amd64.zip",
-            "hash": "03f3c74a3c4ca3dc2e77f333217bf6316e79581b9661d8567b5822cc715b22ba"
+            "url": "https://releases.hashicorp.com/terraform/0.6.16/terraform_0.6.16_windows_amd64.zip",
+            "hash": "6acbc7e7025104d265cbfee982e5e7af0427255fa70bafa5bcbc595b56c6cce7"
         }
     },
     "bin": [
@@ -34,6 +34,7 @@
         "terraform-provider-google.exe",
         "terraform-provider-heroku.exe",
         "terraform-provider-influxdb.exe",
+        "terraform-provider-librato.exe",
         "terraform-provider-mailgun.exe",
         "terraform-provider-mysql.exe",
         "terraform-provider-null.exe",
@@ -42,6 +43,7 @@
         "terraform-provider-postgresql.exe",
         "terraform-provider-powerdns.exe",
         "terraform-provider-rundeck.exe",
+        "terraform-provider-softlayer.exe",
         "terraform-provider-statuscake.exe",
         "terraform-provider-template.exe",
         "terraform-provider-terraform.exe",
@@ -58,6 +60,6 @@
     ],
     "checkver": {
         "url": "https://releases.hashicorp.com/terraform/",
-        "re": "terraform_(\\d+\\.\\d+\\.\\d+)"
+        "re": "terraform_(\\d+\\.\\d+\\.\\d+)\\s*<"
     }
 }
diff --git a/vagrant.json b/vagrant.json
index bda312aa3d..8d0c71213e 100644
--- a/vagrant.json
+++ b/vagrant.json
@@ -1,9 +1,9 @@
 {
     "homepage": "http://www.vagrantup.com/",
-    "version": "1.8.1",
+    "version": "1.8.4",
     "license": "MIT",
-    "url": "https://releases.hashicorp.com/vagrant/1.8.1/vagrant_1.8.1.msi",
-    "hash": "6468cc140f6f236c3ac4bc0bbb1cc2177114249bc344e0aba8c826eae9cc6eb2",
+    "url": "https://releases.hashicorp.com/vagrant/1.8.4/vagrant_1.8.4.msi",
+    "hash": "0202c3ff87faad36e33bc2808c42ce15edf70187a375219fff92875da836371c",
     "extract_dir": "HashiCorp/Vagrant",
     "bin": "bin\\vagrant.exe",
     "checkver": {