summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #5903 from sdodson/dotnet-centosScott Dodson2017-11-074-4/+113
|\ \ \ \ \ \ \ \
| * | | | | | | | Add centos based dotnet 2.0 image streamsScott Dodson2017-10-274-4/+113
* | | | | | | | | Merge pull request #6042 from sdodson/image-stream-syncScott Dodson2017-11-072-19/+511
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix v3.6 xpaas image streamsScott Dodson2017-11-071-9/+307
| * | | | | | | | | Fix v3.7 xpaas image streamsScott Dodson2017-11-071-10/+204
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6046 from mgugino-upstream-stage/fix-github-challenge-authScott Dodson2017-11-071-0/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Re-add challenge auth verification to github and googleMichael Gugino2017-11-071-0/+12
| |/ / / / / / / /
* | | | | | | | | Merge pull request #6047 from sdodson/kubectlScott Dodson2017-11-071-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use oc rather than kubectlScott Dodson2017-11-071-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #6050 from ashcrow/possible-fix-for-scottScott Dodson2017-11-071-1/+28
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | container_binary_sync: Remove atomic prefix from imageSteve Milner2017-11-071-1/+28
* | | | | | | | | Merge pull request #6040 from kwoodson/router_shard_custom_cert_fixScott Dodson2017-11-071-3/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | [Bug 1509354] Check if routers have certificates and use themKenny Woodson2017-11-071-3/+6
| |/ / / / / / /
* | | | | | | | Bug 1510546- Fix previous fix, task was indented one level too deepFabian von Feilitzsch2017-11-071-2/+2
* | | | | | | | Merge pull request #6044 from fabianvf/1510546-asb-fix-cert-conditionalScott Dodson2017-11-071-11/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Move fact definition that breaks when check to end of blockFabian von Feilitzsch2017-11-071-11/+11
| |/ / / / / / /
* | | | | | | | Merge pull request #6036 from mgugino-upstream-stage/fix-prometheus-varsOpenShift Merge Robot2017-11-074-49/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix prometheus default varsMichael Gugino2017-11-074-49/+48
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #6009 from dymurray/templateOpenShift Merge Robot2017-11-072-2/+18
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Proper quotesDylan Murray2017-11-031-2/+2
| * | | | | | | Update service broker configmap and serviceaccount privilegesDylan Murray2017-11-032-2/+18
* | | | | | | | Merge pull request #6031 from abutcher/temporary-servinginfo-clientcaOpenShift Merge Robot2017-11-062-1/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Temporarily set master servingInfo.clientCA as client-ca-bundle.crt during ro...Andrew Butcher2017-11-062-1/+31
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #5976 from fabianvf/asb-etcd-certsScott Dodson2017-11-063-13/+174
|\ \ \ \ \ \ \ \
| * | | | | | | | Bug 1507617- Move etcd into its own service/dc with SSLFabian von Feilitzsch2017-11-033-13/+174
* | | | | | | | | Merge pull request #6027 from mgugino-upstream-stage/retry-restart-master-con...OpenShift Merge Robot2017-11-065-7/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Retry restarting master controllersMichael Gugino2017-11-065-7/+30
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6030 from giuseppe/fix-selinux-docker-tooOpenShift Merge Robot2017-11-062-4/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | container-engine: ensure /var/lib/containers/ is properly labelledGiuseppe Scrivano2017-11-062-4/+9
* | | | | | | | | | Merge pull request #6007 from kwoodson/container_locationOpenShift Merge Robot2017-11-062-0/+48
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Moving docker location to share path with system containers.Kenny Woodson2017-11-062-0/+48
* | | | | | | | | | | Merge pull request #6026 from fabianvf/1509680-asb-credential-checkScott Dodson2017-11-064-5/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Bug 1509680- Fix ansible-service-broker registry validationsFabian von Feilitzsch2017-11-064-5/+7
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5994 from djzager/bz1509052-broker-logfileScott Dodson2017-11-061-1/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Bug 1509052 - Remove logfile from broker configDavid Zager2017-11-021-1/+0
* | | | | | | | | | Merge pull request #5988 from mgugino-upstream-stage/github-auth-fixScott Dodson2017-11-061-4/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix github auth validationMichael Gugino2017-11-021-4/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #5836 from jkroepke/issue_5835Scott Dodson2017-11-062-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Re-generate lib_openshiftJan-Otto Kröpke2017-10-251-1/+1
| * | | | | | | | | Remove provisioner restrictions on oc_storageclassJan-Otto Kröpke2017-10-221-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #6010 from fabianvf/1507787-asb-fix-ocp-defaultsScott Dodson2017-11-051-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bug 1507787- add full path to default asb etcd imageFabian von Feilitzsch2017-11-031-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Revert "Bootstrap enhancements."Clayton Coleman2017-11-0523-321/+273
* | | | | | | | | Merge pull request #5991 from tbielawa/gate_cfmeOpenShift Merge Robot2017-11-042-4/+64
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | management: enterprise users must acknowledge use of beta softwareTim Bielawa2017-11-032-4/+64
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6006 from mgugino-upstream-stage/elb-v2OpenShift Merge Robot2017-11-0323-273/+321
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bootstrap enhancements.Kenny Woodson2017-11-0323-273/+321
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #6005 from mgugino-upstream-stage/fix-master-version-detectOpenShift Merge Robot2017-11-032-1/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix master upgrade version detect and systemd enableMichael Gugino2017-11-032-1/+12
* | | | | | | | | | Merge pull request #5983 from ewolinetz/37_bz1508150OpenShift Merge Robot2017-11-031-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |