diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-27 20:12:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-27 20:12:37 -0400 |
| commit | d1593e6a854c27a262e28c0cf27bf07d46cdbf6a (patch) | |
| tree | 8aa3f1c9854dbae44cd587ac66495c30cd2a5a41 /vendor/github.com | |
| parent | 9c8e0a0f2568d42aec47dd36103713f47ba4c0f2 (diff) | |
| parent | 023c4fadf5fbcd4519ad7701c74bc3604c8cf9f2 (diff) | |
| download | podman-d1593e6a854c27a262e28c0cf27bf07d46cdbf6a.tar.gz podman-d1593e6a854c27a262e28c0cf27bf07d46cdbf6a.tar.bz2 podman-d1593e6a854c27a262e28c0cf27bf07d46cdbf6a.zip | |
Merge pull request #7483 from TomSweeneyRedHat/dev/tsweeney/bumpcommonv2
Bump c/common to v0.14.10 and c/conmon to v2.0.20
Diffstat (limited to 'vendor/github.com')
| -rw-r--r-- | vendor/github.com/containers/common/pkg/config/config_windows.go | 2 | ||||
| -rw-r--r-- | vendor/github.com/containers/common/version/version.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vendor/github.com/containers/common/pkg/config/config_windows.go b/vendor/github.com/containers/common/pkg/config/config_windows.go index 7dbd665bb..1c9806e6b 100644 --- a/vendor/github.com/containers/common/pkg/config/config_windows.go +++ b/vendor/github.com/containers/common/pkg/config/config_windows.go @@ -6,5 +6,5 @@ func customConfigFile() (string, error) { if path, found := os.LookupEnv("CONTAINERS_CONF"); found { return path, nil } - return os.Getenv("LOCALAPPDATA"), nil + return os.Getenv("APPDATA") + "\\containers\\containers.conf", nil } diff --git a/vendor/github.com/containers/common/version/version.go b/vendor/github.com/containers/common/version/version.go index 39ff43d9a..8afce9816 100644 --- a/vendor/github.com/containers/common/version/version.go +++ b/vendor/github.com/containers/common/version/version.go @@ -1,4 +1,4 @@ package version // Version is the version of the build. -const Version = "0.14.9" +const Version = "0.14.10" |