summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6054 from nak3/cleanup-lbOpenShift Merge Robot2017-11-141-0/+4
|\
| * Remove remaining haproxy files with uninstallationKenjiro Nakayama2017-11-081-0/+4
* | Merge pull request #5948 from mtnbikenc/checkpoint-timesOpenShift Merge Robot2017-11-1417-175/+191
|\ \
| * | Add execution times to checkpoint statusRussell Teague2017-10-3117-175/+191
* | | 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
* | | | | Merge pull request #5942 from giuseppe/crio-sync-configurationScott Dodson2017-11-141-0/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | crio: sync crio.confGiuseppe Scrivano2017-11-141-0/+5
* | | | | Merge pull request #5921 from lpsantil/make-nfs-clearMichael Gugino2017-11-141-6/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make clearer *_nfs_directory and *_volume_namelpsantil2017-10-281-6/+18
* | | | | Merge pull request #6101 from mgugino-upstream-stage/fix-tsb-jsonScott Dodson2017-11-135-17/+10
|\ \ \ \ \
| * | | | | Fix extension script for catalogMichael Gugino2017-11-135-17/+10
* | | | | | Merge pull request #6104 from kwoodson/regex_cors_fixScott Dodson2017-11-131-2/+2
|\ \ \ \ \ \
| * | | | | | Regex anchors changed to match protocol start and ports.Kenny Woodson2017-11-131-2/+2
* | | | | | | Merge pull request #6072 from tbielawa/obvious_docsOpenShift Merge Robot2017-11-131-15/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update Docs. Make Clearer where the actual docs are.Tim Bielawa2017-11-091-15/+15
* | | | | | | Merge pull request #6100 from sdodson/v3_8-supportScott Dodson2017-11-13175-11/+88657
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | First pass at v3.8 supportScott Dodson2017-11-13175-11/+88657
|/ / / / / /
* | | | | | Bumping openshift-ansible to 3.8Jenkins CD Merge Bot2017-11-101-2/+2
* | | | | | Merge pull request #5997 from mcanevet/patch-1OpenShift Merge Robot2017-11-091-1/+1
|\ \ \ \ \ \
| * | | | | | Fix contenerized documentation?Mickaël Canévet2017-11-031-1/+1
* | | | | | | 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
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.5-1].Jenkins CD Merge Bot2017-11-092-2/+5
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.4-1].Jenkins CD Merge Bot2017-11-082-2/+5
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.3-1].Jenkins CD Merge Bot2017-11-082-2/+19
* | | | | | | 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-0826-353/+363
|\ \ \ \ \ \ \ \
| * | | | | | | | Bootstrap enhancements.Kenny Woodson2017-11-0826-353/+363
* | | | | | | | | Merge pull request #5829 from sosiouxme/20171020-registry-console-bz1497310Scott Dodson2017-11-086-25/+81
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | reconcile registry-console and docker_image_availabilityLuke Meyer2017-11-066-25/+81
* | | | | | | | | | Merge pull request #6063 from mgugino-upstream-stage/upgrade-minor-validator-fixScott Dodson2017-11-082-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix preupgrade authorization objects are in sync minor versionsMichael Gugino2017-11-082-1/+6
* | | | | | | | | | | Merge pull request #6065 from mgugino-upstream-stage/fix-examples-image-streamsScott Dodson2017-11-082-0/+208
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |