From 9acd031e3b4f03b1411c38cb38094fb472a836b0 Mon Sep 17 00:00:00 2001
From: James Nugent <james@jen20.com>
Date: Tue, 21 Jun 2016 11:19:39 +0300
Subject: [PATCH] deps: Update github.com/hashicorp/hcl/...

Fixes #6774.
---
 .../hashicorp/hcl/hcl/token/token.go          |  5 ++
 vendor/vendor.json                            | 46 +++++++++----------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/vendor/github.com/hashicorp/hcl/hcl/token/token.go b/vendor/github.com/hashicorp/hcl/hcl/token/token.go
index 6e9949804..e37c0664e 100644
--- a/vendor/github.com/hashicorp/hcl/hcl/token/token.go
+++ b/vendor/github.com/hashicorp/hcl/hcl/token/token.go
@@ -152,6 +152,11 @@ func (t Token) Value() interface{} {
 			f = strconv.Unquote
 		}
 
+		// This case occurs if json null is used
+		if t.Text == "" {
+			return ""
+		}
+
 		v, err := f(t.Text)
 		if err != nil {
 			panic(fmt.Sprintf("unquote %s err: %s", t.Text, err))
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 3d18f47dc..67b82fc3c 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -772,68 +772,68 @@
 		{
 			"checksumSHA1": "5LrCq/ydlbL6pq1cdmuxiw7QV98=",
 			"path": "github.com/hashicorp/hcl",
-			"revision": "aa7699b7b62c5f410f4cf7b58f3f9b17a71fb4ad",
-			"revisionTime": "2016-06-16T21:00:17Z"
+			"revision": "da486364306ed66c218be9b7953e19173447c18b",
+			"revisionTime": "2016-06-20T17:04:52Z"
 		},
 		{
 			"checksumSHA1": "WP5ODRo9+USuAsKYPu5RW3q8Epg=",
 			"path": "github.com/hashicorp/hcl/hcl/ast",
-			"revision": "aa7699b7b62c5f410f4cf7b58f3f9b17a71fb4ad",
-			"revisionTime": "2016-06-16T21:00:17Z"
+			"revision": "da486364306ed66c218be9b7953e19173447c18b",
+			"revisionTime": "2016-06-20T17:04:52Z"
 		},
 		{
 			"checksumSHA1": "z03dif8bqgQ3Zk/1RGbvfgBXMXo=",
 			"path": "github.com/hashicorp/hcl/hcl/fmtcmd",
-			"revision": "aa7699b7b62c5f410f4cf7b58f3f9b17a71fb4ad",
-			"revisionTime": "2016-06-16T21:00:17Z"
+			"revision": "da486364306ed66c218be9b7953e19173447c18b",
+			"revisionTime": "2016-06-20T17:04:52Z"
 		},
 		{
 			"checksumSHA1": "SVw0qm83Anf5T2GkYabn+f7Ibv0=",
 			"path": "github.com/hashicorp/hcl/hcl/parser",
-			"revision": "aa7699b7b62c5f410f4cf7b58f3f9b17a71fb4ad",
-			"revisionTime": "2016-06-16T21:00:17Z"
+			"revision": "da486364306ed66c218be9b7953e19173447c18b",
+			"revisionTime": "2016-06-20T17:04:52Z"
 		},
 		{
 			"checksumSHA1": "CSmwxPOTz7GSpnWPF9aGkbVeR64=",
 			"path": "github.com/hashicorp/hcl/hcl/printer",
-			"revision": "aa7699b7b62c5f410f4cf7b58f3f9b17a71fb4ad",
-			"revisionTime": "2016-06-16T21:00:17Z"
+			"revision": "da486364306ed66c218be9b7953e19173447c18b",
+			"revisionTime": "2016-06-20T17:04:52Z"
 		},
 		{
 			"checksumSHA1": "WZM0q7Sya8PcGj607x1npgcEPa4=",
 			"path": "github.com/hashicorp/hcl/hcl/scanner",
-			"revision": "aa7699b7b62c5f410f4cf7b58f3f9b17a71fb4ad",
-			"revisionTime": "2016-06-16T21:00:17Z"
+			"revision": "da486364306ed66c218be9b7953e19173447c18b",
+			"revisionTime": "2016-06-20T17:04:52Z"
 		},
 		{
 			"checksumSHA1": "riN5acfVDm4j6LhWXauqiWH5n84=",
 			"path": "github.com/hashicorp/hcl/hcl/strconv",
-			"revision": "aa7699b7b62c5f410f4cf7b58f3f9b17a71fb4ad",
-			"revisionTime": "2016-06-16T21:00:17Z"
+			"revision": "da486364306ed66c218be9b7953e19173447c18b",
+			"revisionTime": "2016-06-20T17:04:52Z"
 		},
 		{
-			"checksumSHA1": "VGNVyGYDGTTCTRqGH5R+CL0u6xw=",
+			"checksumSHA1": "c6yprzj06ASwCo18TtbbNNBHljA=",
 			"path": "github.com/hashicorp/hcl/hcl/token",
-			"revision": "aa7699b7b62c5f410f4cf7b58f3f9b17a71fb4ad",
-			"revisionTime": "2016-06-16T21:00:17Z"
+			"revision": "da486364306ed66c218be9b7953e19173447c18b",
+			"revisionTime": "2016-06-20T17:04:52Z"
 		},
 		{
 			"checksumSHA1": "uEaK2zagnGctsUmjWt8ZYmK1Yvs=",
 			"path": "github.com/hashicorp/hcl/json/parser",
-			"revision": "aa7699b7b62c5f410f4cf7b58f3f9b17a71fb4ad",
-			"revisionTime": "2016-06-16T21:00:17Z"
+			"revision": "da486364306ed66c218be9b7953e19173447c18b",
+			"revisionTime": "2016-06-20T17:04:52Z"
 		},
 		{
 			"checksumSHA1": "S1e0F9ZKSnqgOLfjDTYazRL28tA=",
 			"path": "github.com/hashicorp/hcl/json/scanner",
-			"revision": "aa7699b7b62c5f410f4cf7b58f3f9b17a71fb4ad",
-			"revisionTime": "2016-06-16T21:00:17Z"
+			"revision": "da486364306ed66c218be9b7953e19173447c18b",
+			"revisionTime": "2016-06-20T17:04:52Z"
 		},
 		{
 			"checksumSHA1": "fNlXQCQEnb+B3k5UDL/r15xtSJY=",
 			"path": "github.com/hashicorp/hcl/json/token",
-			"revision": "aa7699b7b62c5f410f4cf7b58f3f9b17a71fb4ad",
-			"revisionTime": "2016-06-16T21:00:17Z"
+			"revision": "da486364306ed66c218be9b7953e19173447c18b",
+			"revisionTime": "2016-06-20T17:04:52Z"
 		},
 		{
 			"checksumSHA1": "vWW3HXm7OTOMISuZPcCSJODRYkU=",