summaryrefslogtreecommitdiffstats
path: root/playbooks/openshift-management
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-25 20:21:15 -0800
committerGitHub <noreply@github.com>2018-01-25 20:21:15 -0800
commit26f327b96cbe3072589105decee4a7d78932668b (patch)
tree1884a1ba59148d0445f1413cab8fcf8371c21b53 /playbooks/openshift-management
parenta97704f4db140037a67aeb2ca45254e4ecffed6e (diff)
parent796d2ddbd7976b46b4b8d123016cc38721c6529e (diff)
downloadopenshift-26f327b96cbe3072589105decee4a7d78932668b.tar.gz
openshift-26f327b96cbe3072589105decee4a7d78932668b.tar.bz2
openshift-26f327b96cbe3072589105decee4a7d78932668b.tar.xz
openshift-26f327b96cbe3072589105decee4a7d78932668b.zip
Merge pull request #6875 from bparees/sync
Automatic merge from submit-queue. sync imagestreams+templates from origin master for v3.9 fixes https://github.com/openshift/openshift-ansible/issues/6872
Diffstat (limited to 'playbooks/openshift-management')
0 files changed, 0 insertions, 0 deletions