summaryrefslogtreecommitdiffstats
path: root/pytest.ini
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-11-03 21:52:09 -0700
committerGitHub <noreply@github.com>2017-11-03 21:52:09 -0700
commit86643ad6e12d10803fdae5e103a7392795c35a8d (patch)
tree71562b1156b49e812c30f660cf140894267aec0a /pytest.ini
parent413fe019b488b75909629c68949ba693004afd6a (diff)
parent983fdade31c57654854cce3c5340e8bf5a7838e7 (diff)
downloadopenshift-86643ad6e12d10803fdae5e103a7392795c35a8d.tar.gz
openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.tar.bz2
openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.tar.xz
openshift-86643ad6e12d10803fdae5e103a7392795c35a8d.zip
Merge pull request #6006 from mgugino-upstream-stage/elb-v2
Automatic merge from submit-queue. Bootstrap enhancements. This includes the elb work.
Diffstat (limited to 'pytest.ini')
0 files changed, 0 insertions, 0 deletions