diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-07 09:10:00 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-07 09:10:00 -0400 |
commit | 71dd7c814ca41bf18f3f6a52eaf13c8285ea3f24 (patch) | |
tree | 1347a230c6a64da00e0416114de271dcf705632a /pytest.ini | |
parent | 6e50d9a9a741bd073e22d0a5877d59cec703a720 (diff) | |
parent | d782f6dc741538dc322b980785396e061e0330b5 (diff) | |
download | openshift-71dd7c814ca41bf18f3f6a52eaf13c8285ea3f24.tar.gz openshift-71dd7c814ca41bf18f3f6a52eaf13c8285ea3f24.tar.bz2 openshift-71dd7c814ca41bf18f3f6a52eaf13c8285ea3f24.tar.xz openshift-71dd7c814ca41bf18f3f6a52eaf13c8285ea3f24.zip |
Merge pull request #4369 from giuseppe/fix-etcd-system-container
Merged by openshift-bot
Diffstat (limited to 'pytest.ini')
0 files changed, 0 insertions, 0 deletions