Merge pull request #8387 from hashicorp/b-update-hcl

vendor: update HCL for GH-8295
This commit is contained in:
Mitchell Hashimoto 2016-08-22 12:46:56 -04:00 committed by GitHub
commit 6820f136df
2 changed files with 4 additions and 4 deletions

View File

@ -489,7 +489,7 @@ func (d *decoder) decodeStruct(name string, node ast.Node, result reflect.Value)
// the yacc parser would always ensure top-level elements were arrays. The new
// parser does not make the same guarantees, thus we need to convert any
// top-level literal elements into a list.
if _, ok := node.(*ast.LiteralType); ok {
if _, ok := node.(*ast.LiteralType); ok && item != nil {
node = &ast.ObjectList{Items: []*ast.ObjectItem{item}}
}

6
vendor/vendor.json vendored
View File

@ -1148,10 +1148,10 @@
"revision": "7e3c02b30806fa5779d3bdfc152ce4c6f40e7b38"
},
{
"checksumSHA1": "ydHBPi04mEh+Tir+2JkpSIMckcw=",
"checksumSHA1": "8E3sekKdBZ38W0UFwONoZb0txbE=",
"path": "github.com/hashicorp/hcl",
"revision": "d8c773c4cba11b11539e3d45f93daeaa5dcf1fa1",
"revisionTime": "2016-07-11T23:17:52Z"
"revision": "bc40da04e8303cb7406e9ed1a2b742d636c5d960",
"revisionTime": "2016-08-22T16:37:30Z"
},
{
"checksumSHA1": "IxyvRpCFeoJBGl2obLKJV7RCGjg=",