summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge pull request #3252 from mtrmac/registries.conf-mirrorsOpenShift Merge Robot2019-06-14
|\
| * Use the logical registry location instead of the physical one in (podman info)Miloslav Trmač2019-06-14
| * Update containers/image to v2.0.0, and buildah to v1.8.4Miloslav Trmač2019-06-14
* | Merge pull request #3320 from cevich/fix_ssh_raceOpenShift Merge Robot2019-06-14
|\ \
| * | Cirrus: Guarantee ssh is running for rootlessChris Evich2019-06-13
* | | Merge pull request #3315 from giuseppe/support-bind-nonrecursiveOpenShift Merge Robot2019-06-14
|\ \ \ | |_|/ |/| |
| * | storage: support --mount type=bind,bind-nonrecursiveGiuseppe Scrivano2019-06-13
| * | storage: fix typoGiuseppe Scrivano2019-06-13
* | | Merge pull request #3321 from haircommander/conmon-0.3.0OpenShift Merge Robot2019-06-14
|\ \ \
| * | | Bump cirrus imagesPeter Hunt2019-06-13
| * | | Bump conmon to 0.3.0Peter Hunt2019-06-13
| | |/ | |/|
* | | Merge pull request #3322 from mheon/fix_release_notesOpenShift Merge Robot2019-06-14
|\ \ \
| * | | Mention the new Podman mailing list in contributing.mdMatthew Heon2019-06-13
| * | | Update 1.4.0 release notes with ID -> Id in inspectMatthew Heon2019-06-13
* | | | Merge pull request #3312 from mheon/podman_inspect_fixes_contOpenShift Merge Robot2019-06-13
|\ \ \ \
| * | | | Split mount options in inspect furtherMatthew Heon2019-06-13
| * | | | Make Inspect's mounts struct accurate to DockerMatthew Heon2019-06-12
| * | | | Provide OCI spec path in `podman inspect` outputMatthew Heon2019-06-12
| |/ / /
* | | | Merge pull request #3319 from mheon/purge_easyjsonOpenShift Merge Robot2019-06-13
|\ \ \ \ | |_|/ / |/| | |
| * | | Purge all use of easyjson and ffjson in libpodMatthew Heon2019-06-13
| |/ /
* | | Merge pull request #3311 from giuseppe/oci-errorsOpenShift Merge Robot2019-06-13
|\ \ \ | |_|/ |/| |
| * | oci: allow to specify what runtimes support JSONGiuseppe Scrivano2019-06-13
| * | oci: use json formatted errors from the runtimeGiuseppe Scrivano2019-06-13
|/ /
* | Merge pull request #3305 from giuseppe/slirp-dns-firstOpenShift Merge Robot2019-06-12
|\ \
| * | rootless: use the slirp4netns builtin DNS firstGiuseppe Scrivano2019-06-12
* | | Merge pull request #3307 from rhatdan/126OpenShift Merge Robot2019-06-12
|\ \ \ | |/ / |/| |
| * | If container is not in correct state podman exec should exit with 126Daniel J Walsh2019-06-12
|/ /
* | Merge pull request #3298 from ashley-cui/usernameOpenShift Merge Robot2019-06-12
|\ \ | |/ |/|
| * Fix podman-remote to user default usernameAshley Cui2019-06-11
* | Merge pull request #3261 from cevich/no_buildahOpenShift Merge Robot2019-06-11
|\ \
| * | Cirrus: New images w/o buildahChris Evich2019-06-10
| * | Remove source-built buildah from CIChris Evich2019-06-10
* | | Merge pull request #3290 from edsantiago/batsOpenShift Merge Robot2019-06-11
|\ \ \
| * | | Prohibit use of positional args with --importEd Santiago2019-06-11
| * | | BATS tests - get working againEd Santiago2019-06-11
| | |/ | |/|
* | | Merge pull request #3293 from mheon/add_test_for_play_kubeOpenShift Merge Robot2019-06-11
|\ \ \ | |/ / |/| |
| * | Add --filename option to generate kubeMatthew Heon2019-06-11
| * | Add a test for 'podman play kube' to prevent regressionMatthew Heon2019-06-10
* | | Merge pull request #3240 from rhatdan/storageoptsOpenShift Merge Robot2019-06-10
|\ \ \ | |/ / |/| |
| * | When you change the storage driver we ignore the storage-optionsDaniel J Walsh2019-06-08
| * | Update vendor on containers/storage to v1.12.10Daniel J Walsh2019-06-08
* | | Merge pull request #3283 from haircommander/logging-play-kube-hotfixOpenShift Merge Robot2019-06-10
|\ \ \
| * | | only set log driver if it isn't emptyPeter Hunt2019-06-08
* | | | Merge pull request #3254 from ashley-cui/standarddocOpenShift Merge Robot2019-06-10
|\ \ \ \
| * | | | standardize documentation formattingAshley Cui2019-06-10
* | | | | Merge pull request #3237 from cevich/ci_contrib_docOpenShift Merge Robot2019-06-10
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | docs: Add CI section and linksChris Evich2019-05-30
* | | | | Merge pull request #3287 from TomSweeneyRedHat/dev/tsweeney/podmanimage3OpenShift Merge Robot2019-06-10
|\ \ \ \ \
| * | | | | Touchup upstream DockerfileTomSweeneyRedHat2019-06-08
* | | | | | Merge pull request #3285 from CameronNemo/muslOpenShift Merge Robot2019-06-09
|\ \ \ \ \ \ | |/ / / / / |/| | | | |