From ec1651fbf11c4d3d1c792e7f46139ebd96f7ffb2 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 17 Mar 2021 14:43:10 +0100 Subject: Bump github.com/containers/storage from 1.25.0 to 1.28.0 Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.25.0 to 1.28.0. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.25.0...v1.28.0) Signed-off-by: dependabot-preview[bot] Signed-off-by: Giuseppe Scrivano --- vendor/github.com/prometheus/common/model/time.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'vendor/github.com/prometheus/common/model') diff --git a/vendor/github.com/prometheus/common/model/time.go b/vendor/github.com/prometheus/common/model/time.go index 7b0064fdb..490a0240c 100644 --- a/vendor/github.com/prometheus/common/model/time.go +++ b/vendor/github.com/prometheus/common/model/time.go @@ -186,6 +186,10 @@ var durationRE = regexp.MustCompile("^([0-9]+)(y|w|d|h|m|s|ms)$") // ParseDuration parses a string into a time.Duration, assuming that a year // always has 365d, a week always has 7d, and a day always has 24h. func ParseDuration(durationStr string) (Duration, error) { + // Allow 0 without a unit. + if durationStr == "0" { + return 0, nil + } matches := durationRE.FindStringSubmatch(durationStr) if len(matches) != 3 { return 0, fmt.Errorf("not a valid duration string: %q", durationStr) -- cgit v1.2.3-54-g00ecf