summaryrefslogtreecommitdiffstats
path: root/roles/openshift_prometheus
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-05 07:34:52 -0800
committerGitHub <noreply@github.com>2018-01-05 07:34:52 -0800
commit38fd87868572e1cd45b645896fc47b6577271df4 (patch)
treef7074740e99dd7102122d610b9b5ccf9310baf45 /roles/openshift_prometheus
parent9f19afc7529bd7293433b27e834b9ee3479e646f (diff)
parent3e5a8a1b3c545c3050924fc70f105b3c23e7dce7 (diff)
downloadopenshift-38fd87868572e1cd45b645896fc47b6577271df4.tar.gz
openshift-38fd87868572e1cd45b645896fc47b6577271df4.tar.bz2
openshift-38fd87868572e1cd45b645896fc47b6577271df4.tar.xz
openshift-38fd87868572e1cd45b645896fc47b6577271df4.zip
Merge pull request #6615 from giuseppe/cri-o-set-proxy
Automatic merge from submit-queue. cri-o: set proxy variables Make CRI-O honor HTTP_PROXY/HTTPS_PROXY/NO_PROXY. This change https://github.com/kubernetes-incubator/cri-o/pull/1245 in the system container is required
Diffstat (limited to 'roles/openshift_prometheus')
0 files changed, 0 insertions, 0 deletions