diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-18 19:27:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-18 19:27:30 -0500 |
| commit | 7e286bc430ea50b72e972e48626298ac2e1f258a (patch) | |
| tree | 18520dac08ce1401bd183b976f5b01141810e3ae /pkg/util | |
| parent | 797f1ea8cd0b7f4f85df4cf069bcd64c37a8ed1d (diff) | |
| parent | 24cc53cb5fa756a27a24b063b9372b8f8fd4348b (diff) | |
| download | podman-7e286bc430ea50b72e972e48626298ac2e1f258a.tar.gz podman-7e286bc430ea50b72e972e48626298ac2e1f258a.tar.bz2 podman-7e286bc430ea50b72e972e48626298ac2e1f258a.zip | |
Merge pull request #9427 from mheon/bump_301
Bump to v3.0.1
Diffstat (limited to 'pkg/util')
| -rw-r--r-- | pkg/util/utils.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/util/utils.go b/pkg/util/utils.go index e0f631eb4..32bb66332 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -388,7 +388,6 @@ func GetKeepIDMapping() (*storage.IDMappingOptions, int, int, error) { options.HostUIDMapping = false options.HostGIDMapping = false - } // Simply ignore the setting and do not setup an inner namespace for root as it is a no-op return &options, uid, gid, nil @@ -530,9 +529,9 @@ func ParseInputTime(inputTime string) (time.Time, error) { } } - unix_timestamp, err := strconv.ParseInt(inputTime, 10, 64) + unixTimestamp, err := strconv.ParseInt(inputTime, 10, 64) if err == nil { - return time.Unix(unix_timestamp, 0), nil + return time.Unix(unixTimestamp, 0), nil } // input might be a duration |