summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6110 from sdodson/dockershimScott Dodson2017-11-141-0/+6
|\
| * Nuke /var/lib/dockershim/sandbox/* while nodes are drainedScott Dodson2017-11-141-0/+6
* | Merge pull request #5784 from jarrpa/glusterfs-new-featuresOpenShift Merge Robot2017-11-1416-61/+655
|\ \
| * | GlusterFS: Add gluster-s3 functionalityJose A. Rivera2017-11-088-45/+420
| * | GlusterFS: Add glusterblock functionalityJose A. Rivera2017-11-089-0/+210
| * | GlusterFS: Update heketi templates for latest versionJose A. Rivera2017-11-088-16/+22
| * | GlusterFS: Specify resource requestsJose A. Rivera2017-11-081-1/+4
* | | crio: sync crio.confGiuseppe Scrivano2017-11-141-0/+5
| |/ |/|
* | Merge pull request #6101 from mgugino-upstream-stage/fix-tsb-jsonScott Dodson2017-11-132-6/+0
|\ \
| * | Fix extension script for catalogMichael Gugino2017-11-132-6/+0
* | | Regex anchors changed to match protocol start and ports.Kenny Woodson2017-11-131-2/+2
* | | First pass at v3.8 supportScott Dodson2017-11-13164-11/+88175
|/ /
* | Merge pull request #5571 from vshn/registryip1OpenShift Merge Robot2017-11-093-0/+3
|\ \
| * | Allow cluster IP for docker-registry service to be setMichael Hanselmann2017-10-193-0/+3
* | | Merge pull request #6067 from shawn-hurley/bug-specify-keep-namespaceScott Dodson2017-11-082-0/+4
|\ \ \
| * | | Adding configuration for keeping transient namespace on error.Shawn Hurley2017-11-082-0/+4
* | | | Merge pull request #6020 from sdodson/asb-tsbScott Dodson2017-11-086-11/+11
|\ \ \ \
| * | | | Use openshift.common.client_binaryScott Dodson2017-11-082-5/+5
| * | | | Remove duplicate defaulting for ASB and TSBScott Dodson2017-11-084-6/+6
| |/ / /
* | | | Merge pull request #6016 from kwoodson/bootstrap_enhancements-v3Kenny Woodson2017-11-0823-350/+356
|\ \ \ \
| * | | | Bootstrap enhancements.Kenny Woodson2017-11-0823-350/+356
* | | | | Merge pull request #5829 from sosiouxme/20171020-registry-console-bz1497310Scott Dodson2017-11-085-22/+77
|\ \ \ \ \
| * | | | | reconcile registry-console and docker_image_availabilityLuke Meyer2017-11-065-22/+77
* | | | | | Fix examples image streamsMichael Gugino2017-11-082-0/+208
| |_|/ / / |/| | | |
* | | | | Merge pull request #5966 from sdodson/iss-masterScott Dodson2017-11-08143-25707/+2564
|\ \ \ \ \
| * | | | | General template updates for v3.7Scott Dodson2017-11-0811-65/+35
| * | | | | Update to xPaaS v1.4.6Scott Dodson2017-11-08132-25642/+2529
* | | | | | Merge pull request #6060 from zgalor/change_default_namespaceScott Dodson2017-11-081-1/+1
|\ \ \ \ \ \
| * | | | | | Change prometheus default namespace to 'openshift-metrics'Zohar Galor2017-11-081-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #6059 from fabianvf/1511044-fix-asb-cert-lookupScott Dodson2017-11-081-3/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Bug 1511044- Slurp the etcd certs instead of using the lookupFabian von Feilitzsch2017-11-081-3/+12
| |/ / / /
* | | | | Merge pull request #6035 from staebler/1499413-service_catalog_class_and_plan...Scott Dodson2017-11-081-0/+2
|\ \ \ \ \
| * | | | | Give service-catalog controller-manager permissions to update status of Clust...staebler2017-11-061-0/+2
* | | | | | Merge pull request #6055 from sdodson/bz1510746Scott Dodson2017-11-081-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Correct service restart commandScott Dodson2017-11-081-1/+1
* | | | | | Merge pull request #6052 from fabianvf/1510636-asb-local-registry-nameScott Dodson2017-11-081-3/+4
|\ \ \ \ \ \
| * | | | | | Bug 1510636- add name to local registry configFabian von Feilitzsch2017-11-071-3/+4
* | | | | | | Merge pull request #6023 from Miciah/bz1509163-openshift_checks-add-ovs-versi...Scott Dodson2017-11-073-3/+6
|\ \ \ \ \ \ \
| * | | | | | | openshift_checks: Add OVS versions for OCP 3.7Miciah Masters2017-11-063-3/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | 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