summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6084 from mgugino-upstream-stage/combine-master-upgradeOpenShift Merge Robot2017-11-158-3/+298
|\
| * Combine master upgrade play with roleMichael Gugino2017-11-098-3/+298
* | Merge pull request #6105 from kwoodson/docker_crio_fixScott Dodson2017-11-151-1/+1
|\ \
| * | Fixing islnk.Kenny Woodson2017-11-131-1/+1
* | | Merge pull request #6079 from mgugino-upstream-stage/fix-log-local-factsOpenShift Merge Robot2017-11-151-1/+1
|\ \ \
| * | | Fix stale data in openshift_facts for loggingMichael Gugino2017-11-091-1/+1
| | |/ | |/|
* | | Merge pull request #5968 from mgugino-upstream-stage/version-scrubScott Dodson2017-11-1518-160/+13
|\ \ \
| * | | Removed old version codeMichael Gugino2017-11-1418-160/+13
* | | | Merge pull request #6094 from mgugino-upstream-stage/syscontainers-docker-log...OpenShift Merge Robot2017-11-1512-2/+299
|\ \ \ \
| * | | | Alternative method to create docker registry auth credsMichael Gugino2017-11-1412-2/+299
* | | | | Merge pull request #6102 from mgugino-upstream-stage/fix-docker-reg-auth-proxyOpenShift Merge Robot2017-11-141-2/+3
|\ \ \ \ \
| * | | | | Run registry auth after docker restartMichael Gugino2017-11-131-2/+3
| |/ / / /
* | | | | Merge pull request #6095 from kwoodson/add_instance_profile_supportOpenShift Merge Robot2017-11-149-0/+88
|\ \ \ \ \
| * | | | | Adding instance profile support for node groups.Kenny Woodson2017-11-139-0/+88
| |/ / / /
* | | | | Merge pull request #6081 from kwoodson/remove_oc_edit_restrictionsOpenShift Merge Robot2017-11-142-28/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | removing kind restrictions from oc_editKenny Woodson2017-11-092-28/+2
| | |/ / | |/| |
* | | | Merge pull request #5948 from mtnbikenc/checkpoint-timesOpenShift Merge Robot2017-11-142-85/+41
|\ \ \ \
| * | | | Add execution times to checkpoint statusRussell Teague2017-10-312-85/+41
* | | | | 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
|\ \ \ \ \ \