Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Backport changes for glusterfs, heketi, s3 and block templates | Saravanakumar Arumugam | 2018-02-12 | 9 | -20/+370 |
* | Merge pull request #7077 from ewolinetz/logging_facts_sane_yaml_parse | OpenShift Merge Robot | 2018-02-08 | 1 | -3/+4 |
|\ | |||||
| * | Only try to yaml.load a file if it ends in .yml or .yaml in logging facts | Eric Wolinetz | 2018-02-08 | 1 | -3/+4 |
* | | Merge pull request #7072 from jarrpa/gluster-block-route | OpenShift Merge Robot | 2018-02-08 | 1 | -0/+19 |
|\ \ | |||||
| * | | GlusterFS: Fix block StorageClass heketi route | Jose A. Rivera | 2018-02-08 | 1 | -0/+19 |
* | | | Merge pull request #7014 from sdodson/xpaas-148 | Scott Dodson | 2018-02-08 | 337 | -4441/+18610 |
|\ \ \ | |||||
| * | | | xPaaS v1.4.8 for v3.7 | Scott Dodson | 2018-02-08 | 112 | -1480/+6203 |
| * | | | xPaaS v1.4.8-1 for v3.8 | Scott Dodson | 2018-02-08 | 112 | -1480/+6203 |
| * | | | xPaaS v1.4.8-1 for v3.9 | Scott Dodson | 2018-02-08 | 112 | -1480/+6203 |
| * | | | Bump xpaas version | Scott Dodson | 2018-02-08 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #6926 from abutcher/etcd-ca-host | Scott Dodson | 2018-02-08 | 4 | -1/+48 |
|\ \ \ | |||||
| * | | | lib_utils_oo_collect: Allow filtering on dot separated keys. | Andrew Butcher | 2018-02-01 | 1 | -1/+1 |
| * | | | Determine which etcd host is the etcd_ca_host rather than assume it is the fi... | Andrew Butcher | 2018-02-01 | 3 | -0/+47 |
* | | | | Merge pull request #7068 from datarace/logging-fix | Scott Dodson | 2018-02-08 | 4 | -15/+15 |
|\ \ \ \ | |||||
| * | | | | changed oc to {{ openshift_client_binary }} | datarace | 2018-02-08 | 4 | -15/+15 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #7031 from mgugino-upstream-stage/fix-syscon-vars | OpenShift Merge Robot | 2018-02-08 | 2 | -1/+5 |
|\ \ \ \ | |||||
| * | | | | Fix master and node system container variables | Michael Gugino | 2018-02-06 | 2 | -1/+5 |
* | | | | | Bug 1524805- CFME example now works disconnected | Fabian von Feilitzsch | 2018-02-08 | 1 | -1/+1 |
* | | | | | Merge pull request #7055 from fabianvf/bz1541625 | Scott Dodson | 2018-02-08 | 1 | -2/+2 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Bug 1541625- properly cast provided ip address to unicode | Fabian von Feilitzsch | 2018-02-07 | 1 | -2/+2 |
* | | | | | Merge pull request #7060 from mwoodson/master | OpenShift Merge Robot | 2018-02-08 | 1 | -1/+14 |
|\ \ \ \ \ | |||||
| * | | | | | aws ami: make it so the tags from the orinal AMI are used with the newly crea... | Matt Woodson | 2018-02-07 | 1 | -1/+14 |
* | | | | | | Merge pull request #7057 from ashcrow/remove-master-from-ami-node-bootstrap | Kenny Woodson | 2018-02-08 | 2 | -3/+3 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | openshift_node: Remove master from aws node building | Steve Milner | 2018-02-07 | 2 | -3/+3 |
* | | | | | | Merge pull request #7063 from sdodson/wc39 | Scott Dodson | 2018-02-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use v3.9 web-console image for now | Scott Dodson | 2018-02-07 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #6938 from vshn/revert-heketi-image-option | OpenShift Merge Robot | 2018-02-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Revert "GlusterFS: Remove image option from heketi command" | Michael Hanselmann | 2018-01-30 | 1 | -1/+1 |
* | | | | | | Merge pull request #7032 from spadgett/console-liveness | Scott Dodson | 2018-02-07 | 2 | -11/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Detect config changes in console liveness probe | Samuel Padgett | 2018-02-06 | 2 | -11/+11 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #7044 from zgalor/fix_uninstall_bug | OpenShift Merge Robot | 2018-02-07 | 1 | -0/+0 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Fix uninstall using openshift_prometheus_state=absent | Zohar Galor | 2018-02-07 | 1 | -0/+0 |
* | | | | | | Merge pull request #7007 from abutcher/master-cert-idempotence | Scott Dodson | 2018-02-07 | 1 | -17/+8 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Correct the list of certificates checked in openshift_master_certificates s.t... | Andrew Butcher | 2018-02-05 | 1 | -17/+8 |
* | | | | | | Merge pull request #7004 from cooktheryan/master-tag-fix | OpenShift Merge Robot | 2018-02-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | tag fix without ose- | Ryan Cook | 2018-02-02 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #7050 from jarrpa/gluster-doc-update | OpenShift Merge Robot | 2018-02-07 | 1 | -11/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | GlusterFS: Minor documentation update | Jose A. Rivera | 2018-02-07 | 1 | -11/+11 |
* | | | | | | | Allow OVS 2.7 in OCP 3.10 | Scott Dodson | 2018-02-07 | 2 | -2/+2 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #6993 from joelddiaz/deprovision_elbs | Kenny Woodson | 2018-02-07 | 6 | -29/+82 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | add deprovisioning for ELB (and IAM certs) | Joel Diaz | 2018-02-02 | 6 | -29/+82 |
* | | | | | | Merge pull request #6688 from jsanda/termination-grace-period | OpenShift Merge Robot | 2018-02-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [6632] fix indentation of terminationGracePeriodSeconds var | John Sanda | 2018-01-10 | 1 | -1/+1 |
* | | | | | | | Merge pull request #7035 from sosiouxme/20180206-ovs-2.9 | OpenShift Merge Robot | 2018-02-06 | 3 | -9/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | health checks: tolerate ovs 2.9 | Luke Meyer | 2018-02-06 | 3 | -9/+17 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #7015 from sdodson/v310 | Scott Dodson | 2018-02-06 | 197 | -31/+96215 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Initial support for 3.10 | Scott Dodson | 2018-02-05 | 197 | -31/+96215 |
* | | | | | | | | Fix docker rpm upgrade install task wording | Michael Gugino | 2018-02-06 | 1 | -1/+1 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #6628 from ewolinetz/es_5.x_opt_in | OpenShift Merge Robot | 2018-02-06 | 53 | -116/+1690 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Swapping container order for es pod | Eric Wolinetz | 2018-02-05 | 2 | -73/+73 |