From 38aebc056dd3e36f0d1b33da6861462f48f2044f Mon Sep 17 00:00:00 2001
From: Michael Schurter <schmichael@hashicorp.com>
Date: Fri, 2 Jun 2017 15:58:52 -0700
Subject: [PATCH] Switch to hashicorp/go-envparse

---
 client/consul_template.go                            |  2 +-
 .../{schmichael => hashicorp}/go-envparse/LICENSE    |  0
 .../go-envparse/NOTICES.txt                          |  0
 .../{schmichael => hashicorp}/go-envparse/README.md  |  7 +++----
 .../go-envparse/envparse.go                          |  2 +-
 vendor/vendor.json                                   | 12 ++++++------
 6 files changed, 11 insertions(+), 12 deletions(-)
 rename vendor/github.com/{schmichael => hashicorp}/go-envparse/LICENSE (100%)
 rename vendor/github.com/{schmichael => hashicorp}/go-envparse/NOTICES.txt (100%)
 rename vendor/github.com/{schmichael => hashicorp}/go-envparse/README.md (81%)
 rename vendor/github.com/{schmichael => hashicorp}/go-envparse/envparse.go (99%)

diff --git a/client/consul_template.go b/client/consul_template.go
index 343c139af..dd71e89a7 100644
--- a/client/consul_template.go
+++ b/client/consul_template.go
@@ -13,11 +13,11 @@ import (
 	ctconf "github.com/hashicorp/consul-template/config"
 	"github.com/hashicorp/consul-template/manager"
 	"github.com/hashicorp/consul-template/signals"
+	envparse "github.com/hashicorp/go-envparse"
 	multierror "github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/nomad/client/config"
 	"github.com/hashicorp/nomad/client/driver/env"
 	"github.com/hashicorp/nomad/nomad/structs"
-	envparse "github.com/schmichael/go-envparse"
 )
 
 const (
diff --git a/vendor/github.com/schmichael/go-envparse/LICENSE b/vendor/github.com/hashicorp/go-envparse/LICENSE
similarity index 100%
rename from vendor/github.com/schmichael/go-envparse/LICENSE
rename to vendor/github.com/hashicorp/go-envparse/LICENSE
diff --git a/vendor/github.com/schmichael/go-envparse/NOTICES.txt b/vendor/github.com/hashicorp/go-envparse/NOTICES.txt
similarity index 100%
rename from vendor/github.com/schmichael/go-envparse/NOTICES.txt
rename to vendor/github.com/hashicorp/go-envparse/NOTICES.txt
diff --git a/vendor/github.com/schmichael/go-envparse/README.md b/vendor/github.com/hashicorp/go-envparse/README.md
similarity index 81%
rename from vendor/github.com/schmichael/go-envparse/README.md
rename to vendor/github.com/hashicorp/go-envparse/README.md
index c6ad507e2..dba71cef7 100644
--- a/vendor/github.com/schmichael/go-envparse/README.md
+++ b/vendor/github.com/hashicorp/go-envparse/README.md
@@ -1,7 +1,6 @@
-[![GoDoc](https://godoc.org/github.com/schmichael/go-envparse?status.svg)](https://godoc.org/github.com/schmichael/go-envparse)
-[![Build Status](https://travis-ci.org/schmichael/go-envparse.svg?branch=master)](https://travis-ci.org/schmichael/go-envparse)
-[![Build status](https://ci.appveyor.com/api/projects/status/o6mdepblusp1g74d?svg=true)](https://ci.appveyor.com/project/schmichael/go-envparse)
-[![Coverage Status](https://coveralls.io/repos/github/schmichael/go-envparse/badge.svg?branch=master)](https://coveralls.io/github/schmichael/go-envparse?branch=master)
+[![GoDoc](https://godoc.org/github.com/hashicorp/go-envparse?status.svg)](https://godoc.org/github.com/hashicorp/go-envparse)
+[![Build Status](https://travis-ci.org/hashicorp/go-envparse.svg?branch=master)](https://travis-ci.org/hashicorp/go-envparse)
+[![Coverage Status](https://coveralls.io/repos/github/hashicorp/go-envparse/badge.svg?branch=master)](https://coveralls.io/github/hashicorp/go-envparse?branch=master)
 
 # go-envparse
 
diff --git a/vendor/github.com/schmichael/go-envparse/envparse.go b/vendor/github.com/hashicorp/go-envparse/envparse.go
similarity index 99%
rename from vendor/github.com/schmichael/go-envparse/envparse.go
rename to vendor/github.com/hashicorp/go-envparse/envparse.go
index 7c4a9c438..de29a8479 100644
--- a/vendor/github.com/schmichael/go-envparse/envparse.go
+++ b/vendor/github.com/hashicorp/go-envparse/envparse.go
@@ -54,7 +54,7 @@ func parseError(line int, err error) error {
 	}
 }
 
-// Parse environmnet variables from an io.Reader into a map or return a
+// Parse environment variables from an io.Reader into a map or return a
 // ParseError.
 func Parse(r io.Reader) (map[string]string, error) {
 	env := make(map[string]string)
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 8de584c8f..4f7cbcb78 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -682,6 +682,12 @@
 			"revision": "a45970658e51fea2c41445ff0f7e07106d007617",
 			"revisionTime": "2017-02-11T00:33:01Z"
 		},
+		{
+			"checksumSHA1": "mB5JzxaVCPIvbwADY0acdnkhmT8=",
+			"path": "github.com/hashicorp/go-envparse",
+			"revision": "7953113a2936d8e5f7e2a0a3dd8089565c39ef21",
+			"revisionTime": "2017-06-02T22:43:19Z"
+		},
 		{
 			"checksumSHA1": "hHoNT6CfqcDF1+yXRKnz/duuwIk=",
 			"path": "github.com/hashicorp/go-getter",
@@ -1053,12 +1059,6 @@
 			"revision": "50b9b539927dfe231b8be1caf81b2c81d5940276",
 			"revisionTime": "2016-06-28T05:25:20Z"
 		},
-		{
-			"checksumSHA1": "0nmSguB9Hrc2vM2FTV1NRmOW1JE=",
-			"path": "github.com/schmichael/go-envparse",
-			"revision": "ec769f639d2838f80ec2aeed0e2753d8db06963a",
-			"revisionTime": "2017-06-02T21:50:00Z"
-		},
 		{
 			"checksumSHA1": "tnMZLo/kR9Kqx6GtmWwowtTLlA8=",
 			"path": "github.com/sean-/seed",