summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-11 07:59:35 -0700
committerGitHub <noreply@github.com>2017-10-11 07:59:35 -0700
commit0db302a8eb8cef17fe20ef651cad6e4cb3308d2b (patch)
tree629a58342f5799856d13321c61b90943e574aff3 /roles/openshift_hosted
parentb35eb14f85fab4a8f1411feb43a563b19c73c438 (diff)
parente88832c4040ada5a98857a88b06070a009438b4a (diff)
downloadopenshift-0db302a8eb8cef17fe20ef651cad6e4cb3308d2b.tar.gz
openshift-0db302a8eb8cef17fe20ef651cad6e4cb3308d2b.tar.bz2
openshift-0db302a8eb8cef17fe20ef651cad6e4cb3308d2b.tar.xz
openshift-0db302a8eb8cef17fe20ef651cad6e4cb3308d2b.zip
Merge pull request #5617 from simo5/up36role
Automatic merge from submit-queue. Force reconciliation of role for 3.6 This is needed because in 3.6 we cannot reconcile non-cluster roles in the bootstrap reconciliation code. In 3.7 this is taken care of in code.
Diffstat (limited to 'roles/openshift_hosted')
0 files changed, 0 insertions, 0 deletions