Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6105 from kwoodson/docker_crio_fix | Scott Dodson | 2017-11-15 | 1 | -1/+1 |
|\ | |||||
| * | Fixing islnk. | Kenny Woodson | 2017-11-13 | 1 | -1/+1 |
* | | Merge pull request #6079 from mgugino-upstream-stage/fix-log-local-facts | OpenShift Merge Robot | 2017-11-15 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix stale data in openshift_facts for logging | Michael Gugino | 2017-11-09 | 1 | -1/+1 |
* | | | Merge pull request #5968 from mgugino-upstream-stage/version-scrub | Scott Dodson | 2017-11-15 | 18 | -160/+13 |
|\ \ \ | |||||
| * | | | Removed old version code | Michael Gugino | 2017-11-14 | 18 | -160/+13 |
* | | | | Merge pull request #6094 from mgugino-upstream-stage/syscontainers-docker-log... | OpenShift Merge Robot | 2017-11-15 | 12 | -2/+299 |
|\ \ \ \ | |||||
| * | | | | Alternative method to create docker registry auth creds | Michael Gugino | 2017-11-14 | 12 | -2/+299 |
* | | | | | Merge pull request #6102 from mgugino-upstream-stage/fix-docker-reg-auth-proxy | OpenShift Merge Robot | 2017-11-14 | 1 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Run registry auth after docker restart | Michael Gugino | 2017-11-13 | 1 | -2/+3 |
| |/ / / / | |||||
* | | | | | Merge pull request #6095 from kwoodson/add_instance_profile_support | OpenShift Merge Robot | 2017-11-14 | 9 | -0/+88 |
|\ \ \ \ \ | |||||
| * | | | | | Adding instance profile support for node groups. | Kenny Woodson | 2017-11-13 | 9 | -0/+88 |
| |/ / / / | |||||
* | | | | | Merge pull request #6081 from kwoodson/remove_oc_edit_restrictions | OpenShift Merge Robot | 2017-11-14 | 2 | -28/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | removing kind restrictions from oc_edit | Kenny Woodson | 2017-11-09 | 2 | -28/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #5948 from mtnbikenc/checkpoint-times | OpenShift Merge Robot | 2017-11-14 | 2 | -85/+41 |
|\ \ \ \ | |||||
| * | | | | Add execution times to checkpoint status | Russell Teague | 2017-10-31 | 2 | -85/+41 |
* | | | | | Merge pull request #6110 from sdodson/dockershim | Scott Dodson | 2017-11-14 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Nuke /var/lib/dockershim/sandbox/* while nodes are drained | Scott Dodson | 2017-11-14 | 1 | -0/+6 |
* | | | | | | Merge pull request #5784 from jarrpa/glusterfs-new-features | OpenShift Merge Robot | 2017-11-14 | 16 | -61/+655 |
|\ \ \ \ \ \ | |||||
| * | | | | | | GlusterFS: Add gluster-s3 functionality | Jose A. Rivera | 2017-11-08 | 8 | -45/+420 |
| * | | | | | | GlusterFS: Add glusterblock functionality | Jose A. Rivera | 2017-11-08 | 9 | -0/+210 |
| * | | | | | | GlusterFS: Update heketi templates for latest version | Jose A. Rivera | 2017-11-08 | 8 | -16/+22 |
| * | | | | | | GlusterFS: Specify resource requests | Jose A. Rivera | 2017-11-08 | 1 | -1/+4 |
* | | | | | | | crio: sync crio.conf | Giuseppe Scrivano | 2017-11-14 | 1 | -0/+5 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #6101 from mgugino-upstream-stage/fix-tsb-json | Scott Dodson | 2017-11-13 | 2 | -6/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix extension script for catalog | Michael Gugino | 2017-11-13 | 2 | -6/+0 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Regex anchors changed to match protocol start and ports. | Kenny Woodson | 2017-11-13 | 1 | -2/+2 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | First pass at v3.8 support | Scott Dodson | 2017-11-13 | 164 | -11/+88175 |
|/ / / / | |||||
* | | | | Merge pull request #5571 from vshn/registryip1 | OpenShift Merge Robot | 2017-11-09 | 3 | -0/+3 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Allow cluster IP for docker-registry service to be set | Michael Hanselmann | 2017-10-19 | 3 | -0/+3 |
* | | | | Merge pull request #6067 from shawn-hurley/bug-specify-keep-namespace | Scott Dodson | 2017-11-08 | 2 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | Adding configuration for keeping transient namespace on error. | Shawn Hurley | 2017-11-08 | 2 | -0/+4 |
* | | | | | Merge pull request #6020 from sdodson/asb-tsb | Scott Dodson | 2017-11-08 | 6 | -11/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Use openshift.common.client_binary | Scott Dodson | 2017-11-08 | 2 | -5/+5 |
| * | | | | | Remove duplicate defaulting for ASB and TSB | Scott Dodson | 2017-11-08 | 4 | -6/+6 |
| |/ / / / | |||||
* | | | | | Merge pull request #6016 from kwoodson/bootstrap_enhancements-v3 | Kenny Woodson | 2017-11-08 | 23 | -350/+356 |
|\ \ \ \ \ | |||||
| * | | | | | Bootstrap enhancements. | Kenny Woodson | 2017-11-08 | 23 | -350/+356 |
* | | | | | | Merge pull request #5829 from sosiouxme/20171020-registry-console-bz1497310 | Scott Dodson | 2017-11-08 | 5 | -22/+77 |
|\ \ \ \ \ \ | |||||
| * | | | | | | reconcile registry-console and docker_image_availability | Luke Meyer | 2017-11-06 | 5 | -22/+77 |
* | | | | | | | Fix examples image streams | Michael Gugino | 2017-11-08 | 2 | -0/+208 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #5966 from sdodson/iss-master | Scott Dodson | 2017-11-08 | 143 | -25707/+2564 |
|\ \ \ \ \ \ | |||||
| * | | | | | | General template updates for v3.7 | Scott Dodson | 2017-11-08 | 11 | -65/+35 |
| * | | | | | | Update to xPaaS v1.4.6 | Scott Dodson | 2017-11-08 | 132 | -25642/+2529 |
* | | | | | | | Merge pull request #6060 from zgalor/change_default_namespace | Scott Dodson | 2017-11-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Change prometheus default namespace to 'openshift-metrics' | Zohar Galor | 2017-11-08 | 1 | -1/+1 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #6059 from fabianvf/1511044-fix-asb-cert-lookup | Scott Dodson | 2017-11-08 | 1 | -3/+12 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Bug 1511044- Slurp the etcd certs instead of using the lookup | Fabian von Feilitzsch | 2017-11-08 | 1 | -3/+12 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #6035 from staebler/1499413-service_catalog_class_and_plan... | Scott Dodson | 2017-11-08 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Give service-catalog controller-manager permissions to update status of Clust... | staebler | 2017-11-06 | 1 | -0/+2 |
* | | | | | | | Merge pull request #6055 from sdodson/bz1510746 | Scott Dodson | 2017-11-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | |