summaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-09-13 19:05:17 -0400
committerGitHub <noreply@github.com>2017-09-13 19:05:17 -0400
commitf0315bb58c2664d5778e8c6d29ac03475282d474 (patch)
tree5f68af62c09f22d12be1f058cfbd0188138a758b /tox.ini
parent461d13747238b9ebddbc370de79bee0ece38b7a8 (diff)
parent50f43c68a57f18e6b66dc49de6204780c435d584 (diff)
downloadopenshift-f0315bb58c2664d5778e8c6d29ac03475282d474.tar.gz
openshift-f0315bb58c2664d5778e8c6d29ac03475282d474.tar.bz2
openshift-f0315bb58c2664d5778e8c6d29ac03475282d474.tar.xz
openshift-f0315bb58c2664d5778e8c6d29ac03475282d474.zip
Merge pull request #5370 from jmencak/tuned-openshift-ansible-bad_merge-fix
Merged by openshift-bot
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions