diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-19 03:49:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-19 03:49:17 -0700 |
| commit | c4a551373004219fd2d50e5b055dbc5e233e4e32 (patch) | |
| tree | deeb60c8d13ba55ff32512b29a183748ced677cc /vendor/github.com/prometheus/common/model | |
| parent | 5d9b07096b49877608250c7d51e0ee35b9d502c7 (diff) | |
| parent | ec1651fbf11c4d3d1c792e7f46139ebd96f7ffb2 (diff) | |
| download | podman-c4a551373004219fd2d50e5b055dbc5e233e4e32.tar.gz podman-c4a551373004219fd2d50e5b055dbc5e233e4e32.tar.bz2 podman-c4a551373004219fd2d50e5b055dbc5e233e4e32.zip | |
Merge pull request #9734 from containers/dependabot/go_modules/github.com/containers/storage-1.28.0
Bump github.com/containers/storage from 1.25.0 to 1.28.0
Diffstat (limited to 'vendor/github.com/prometheus/common/model')
| -rw-r--r-- | vendor/github.com/prometheus/common/model/time.go | 4 |
1 files changed, 4 insertions, 0 deletions
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) |