summaryrefslogtreecommitdiffstats
path: root/roles/container_runtime/defaults
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-29 10:48:27 -0800
committerGitHub <noreply@github.com>2018-01-29 10:48:27 -0800
commit3346448363ead62312cb29596dcf3df5ce753ef7 (patch)
tree212fc0abfe1ab4131751db188ee53b4622bea1d6 /roles/container_runtime/defaults
parent6b1b0a07bc3ffec47021c4c4e77d96defc268b77 (diff)
parent59615091a29807550d5dea3a404f7d0eb25387cf (diff)
downloadopenshift-3346448363ead62312cb29596dcf3df5ce753ef7.tar.gz
openshift-3346448363ead62312cb29596dcf3df5ce753ef7.tar.bz2
openshift-3346448363ead62312cb29596dcf3df5ce753ef7.tar.xz
openshift-3346448363ead62312cb29596dcf3df5ce753ef7.zip
Merge pull request #6215 from sdodson/bz1511870
Automatic merge from submit-queue. Add kube service ipaddress to no_proxy list Computed as the first ip address in the portal_net Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1511870
Diffstat (limited to 'roles/container_runtime/defaults')
0 files changed, 0 insertions, 0 deletions