diff options
| author | Niall Sheridan <nsheridan@gmail.com> | 2016-10-08 16:02:50 -0500 |
|---|---|---|
| committer | Niall Sheridan <nsheridan@gmail.com> | 2016-10-08 16:02:50 -0500 |
| commit | baf7141d1dd0f99d561a2197a909c66dd389809d (patch) | |
| tree | 92c176f713b0b28893344261b1e567db5e30ba79 /vendor/gopkg.in | |
| parent | 696aebffe56853345d679d4d2b3051236423c6db (diff) | |
Update dependencies
Diffstat (limited to 'vendor/gopkg.in')
| -rw-r--r-- | vendor/gopkg.in/yaml.v2/README.md | 2 | ||||
| -rw-r--r-- | vendor/gopkg.in/yaml.v2/decode.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vendor/gopkg.in/yaml.v2/README.md b/vendor/gopkg.in/yaml.v2/README.md index 7b8bd86..1884de6 100644 --- a/vendor/gopkg.in/yaml.v2/README.md +++ b/vendor/gopkg.in/yaml.v2/README.md @@ -42,7 +42,7 @@ The package API for yaml v2 will remain stable as described in [gopkg.in](https: License ------- -The yaml package is licensed under the LGPL with an exception that allows it to be linked statically. Please see the LICENSE file for details. +The yaml package is licensed under the Apache License 2.0. Please see the LICENSE file for details. Example diff --git a/vendor/gopkg.in/yaml.v2/decode.go b/vendor/gopkg.in/yaml.v2/decode.go index 085cddc..b13ab9f 100644 --- a/vendor/gopkg.in/yaml.v2/decode.go +++ b/vendor/gopkg.in/yaml.v2/decode.go @@ -251,7 +251,7 @@ func (d *decoder) callUnmarshaler(n *node, u Unmarshaler) (good bool) { // // If n holds a null value, prepare returns before doing anything. func (d *decoder) prepare(n *node, out reflect.Value) (newout reflect.Value, unmarshaled, good bool) { - if n.tag == yaml_NULL_TAG || n.kind == scalarNode && n.tag == "" && (n.value == "null" || n.value == "") { + if n.tag == yaml_NULL_TAG || n.kind == scalarNode && n.tag == "" && (n.value == "null" || n.value == "" && n.implicit) { return out, false, false } again := true |