summaryrefslogtreecommitdiff
path: root/vendor/github.com
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-09 08:12:16 -0500
committerGitHub <noreply@github.com>2020-12-09 08:12:16 -0500
commit247260081a5cdc4065009bcd1080c987974327e5 (patch)
tree278f2fb67adb161afb39e3fcbc1105abfa532deb /vendor/github.com
parent3aad9024b6d59bb9f73e7da07c25ba3e1b52954a (diff)
parent37fbf28d74927b959b36ceade7fde3402ea08e05 (diff)
downloadpodman-247260081a5cdc4065009bcd1080c987974327e5.tar.gz
podman-247260081a5cdc4065009bcd1080c987974327e5.tar.bz2
podman-247260081a5cdc4065009bcd1080c987974327e5.zip
Merge pull request #8656 from containers/dependabot/go_modules/k8s.io/apimachinery-0.20.0
Bump k8s.io/apimachinery from 0.19.4 to 0.20.0
Diffstat (limited to 'vendor/github.com')
-rw-r--r--vendor/github.com/golang/protobuf/proto/text_decode.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/github.com/golang/protobuf/proto/text_decode.go b/vendor/github.com/golang/protobuf/proto/text_decode.go
index 4a5931009..47eb3e445 100644
--- a/vendor/github.com/golang/protobuf/proto/text_decode.go
+++ b/vendor/github.com/golang/protobuf/proto/text_decode.go
@@ -765,7 +765,7 @@ func unescape(s string) (ch string, tail string, err error) {
if i > utf8.MaxRune {
return "", "", fmt.Errorf(`\%c%s is not a valid Unicode code point`, r, ss)
}
- return string(i), s, nil
+ return string(rune(i)), s, nil
}
return "", "", fmt.Errorf(`unknown escape \%c`, r)
}