summaryrefslogtreecommitdiff
path: root/libpod/adapter
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-01-14 08:17:24 -0800
committerGitHub <noreply@github.com>2019-01-14 08:17:24 -0800
commit30f115a96034275fc7136b1ec576d57ec2cf099e (patch)
tree5128661e1bd0a3e9977766eea1481972333400df /libpod/adapter
parent6f8e569ae2e7cdaecfb98d548c28b16603302455 (diff)
parent9ab838524c35e16c4f64c1a0f1f21d88d1ca1a2a (diff)
downloadpodman-30f115a96034275fc7136b1ec576d57ec2cf099e.tar.gz
podman-30f115a96034275fc7136b1ec576d57ec2cf099e.tar.bz2
podman-30f115a96034275fc7136b1ec576d57ec2cf099e.zip
Merge pull request #2153 from mheon/update_for_1.0
Update master branch with v1.0 changes from 1.0 branch
Diffstat (limited to 'libpod/adapter')
0 files changed, 0 insertions, 0 deletions