summaryrefslogtreecommitdiff
path: root/vendor/github.com/json-iterator/go/adapter.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-09-05 19:44:43 +0200
committerGitHub <noreply@github.com>2019-09-05 19:44:43 +0200
commitcef5bec06b200ffa5caed46db296e55fb7d72376 (patch)
tree2dd8944e49a07b8f067f07ac8c880244f97dbdb8 /vendor/github.com/json-iterator/go/adapter.go
parent3f81f4409d41510dd7440af9a3321c949ca485a0 (diff)
parentf66a2069f1b26ff9987b008ba4b0c91ac3b682cc (diff)
downloadpodman-cef5bec06b200ffa5caed46db296e55fb7d72376.tar.gz
podman-cef5bec06b200ffa5caed46db296e55fb7d72376.tar.bz2
podman-cef5bec06b200ffa5caed46db296e55fb7d72376.zip
Merge pull request #3948 from openSUSE/buildah-update
Update buildah to v1.11.0
Diffstat (limited to 'vendor/github.com/json-iterator/go/adapter.go')
-rw-r--r--vendor/github.com/json-iterator/go/adapter.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/github.com/json-iterator/go/adapter.go b/vendor/github.com/json-iterator/go/adapter.go
index e674d0f39..92d2cc4a3 100644
--- a/vendor/github.com/json-iterator/go/adapter.go
+++ b/vendor/github.com/json-iterator/go/adapter.go
@@ -16,7 +16,7 @@ func Unmarshal(data []byte, v interface{}) error {
return ConfigDefault.Unmarshal(data, v)
}
-// UnmarshalFromString convenient method to read from string instead of []byte
+// UnmarshalFromString is a convenient method to read from string instead of []byte
func UnmarshalFromString(str string, v interface{}) error {
return ConfigDefault.UnmarshalFromString(str, v)
}