Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6862 from ewolinetz/deprecate_use_callback | OpenShift Merge Robot | 2018-01-26 | 2 | -4/+7 |
|\ | |||||
| * | Updating deprecations to use callback plugin | Eric Wolinetz | 2018-01-25 | 3 | -4/+11 |
* | | Merge pull request #6882 from spadgett/console-node-selector | OpenShift Merge Robot | 2018-01-26 | 1 | -1/+1 |
|\ \ | |||||
| * | | Run console pods on the master | Samuel Padgett | 2018-01-25 | 1 | -1/+1 |
* | | | Merge pull request #6821 from spadgett/remove-asset-config | Scott Dodson | 2018-01-26 | 4 | -2/+24 |
|\ \ \ | |||||
| * | | | Remove old assetConfig from master-config.yaml | Samuel Padgett | 2018-01-25 | 3 | -2/+21 |
| * | | | Don't emit assetConfig on 3.9 | Scott Dodson | 2018-01-25 | 1 | -0/+3 |
| |/ / | |||||
* | | | Merge pull request #6880 from sosiouxme/20180115-docker-image-locations | OpenShift Merge Robot | 2018-01-26 | 2 | -13/+47 |
|\ \ \ | |||||
| * | | | docker_image_availability: containerized overrides | Luke Meyer | 2018-01-25 | 2 | -13/+47 |
| |/ / | |||||
* | | | Merge pull request #6857 from mtnbikenc/fix-1537946 | OpenShift Merge Robot | 2018-01-25 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | [1537946] Correct conditional check for GlusterFS IPs | Russell Teague | 2018-01-24 | 1 | -1/+2 |
* | | | | Merge pull request #6875 from bparees/sync | OpenShift Merge Robot | 2018-01-25 | 21 | -127/+746 |
|\ \ \ \ | |||||
| * | | | | sync imagestreams+templates from origin master for v3.9 | Ben Parees | 2018-01-25 | 21 | -127/+746 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #6859 from abutcher/bz1536217 | OpenShift Merge Robot | 2018-01-25 | 1 | -0/+53 |
|\ \ \ \ | |||||
| * | | | | Redeploy etcd certificates during upgrade when etcd hostname not present in e... | Andrew Butcher | 2018-01-24 | 1 | -0/+53 |
* | | | | | Merge pull request #6878 from mtnbikenc/fix-1502838 | OpenShift Merge Robot | 2018-01-25 | 1 | -3/+4 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | [1502838] Correct certificate alt name parsing | Russell Teague | 2018-01-25 | 1 | -3/+4 |
* | | | | | Merge pull request #6865 from giuseppe/node-specify-bind-option | Scott Dodson | 2018-01-25 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | node: specify bind option to /root/.docker | Giuseppe Scrivano | 2018-01-25 | 1 | -0/+1 |
* | | | | | Merge pull request #6734 from ewolinetz/logging_red_restart_check | Scott Dodson | 2018-01-25 | 3 | -71/+97 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Only automatically restart if cluster is in yellow or green state | Eric Wolinetz | 2018-01-24 | 3 | -71/+97 |
| |/ / / | |||||
* | | | | Merge pull request #6841 from sdodson/bz1491100 | OpenShift Merge Robot | 2018-01-25 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | Set a default for openshift_hosted_registry_storage_azure_blob_realm | Scott Dodson | 2018-01-23 | 1 | -0/+2 |
| |/ / / | |||||
* | | | | Merge pull request #6849 from vrutkovs/label-masters-with-upstream-standard | OpenShift Merge Robot | 2018-01-25 | 3 | -22/+31 |
|\ \ \ \ | |||||
| * | | | | openshift_manage_node: Label nodes in one pass | Vadim Rutkovsky | 2018-01-24 | 1 | -14/+6 |
| * | | | | Label masters with node-role.kubernetes.io/master. This PR also sets these la... | Vadim Rutkovsky | 2018-01-24 | 3 | -22/+39 |
* | | | | | Merge pull request #6626 from pgier/prometheus-remove-tsdb-block-config | OpenShift Merge Robot | 2018-01-24 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | openshift_prometheus: remove block duration settings | Paul Gier | 2018-01-17 | 2 | -2/+2 |
* | | | | | | Merge pull request #6848 from mgugino-upstream-stage/remove-fact-labels | OpenShift Merge Robot | 2018-01-24 | 1 | -3/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove unused node.lables from openshift_facts | Michael Gugino | 2018-01-24 | 1 | -3/+0 |
* | | | | | | | Merge pull request #6551 from mgugino-upstream-stage/swapoff | Scott Dodson | 2018-01-24 | 4 | -62/+148 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Create swapoff module | Michael Gugino | 2018-01-24 | 4 | -62/+148 |
* | | | | | | | | Merge pull request #6843 from rajatchopra/bugdnsmasq | Scott Dodson | 2018-01-24 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Change dnsmasq Requires to Wants. https://bugzilla.redhat.com/show_bug.cgi?id... | Rajat Chopra | 2018-01-23 | 2 | -2/+2 |
* | | | | | | | | Merge pull request #6819 from fabianvf/1524805-service-catalog-pull-policy | OpenShift Merge Robot | 2018-01-24 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Bug 1524805- ServiceCatalog now works disconnected | Fabian von Feilitzsch | 2018-01-22 | 2 | -2/+2 |
* | | | | | | | | | Merge pull request #6825 from vrutkovs/nfs-storage-quotes | OpenShift Merge Robot | 2018-01-24 | 1 | -8/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | NFS Storage: make sure openshift_hosted_*_storage_nfs_directory are quoted | Vadim Rutkovsky | 2018-01-23 | 1 | -8/+8 |
* | | | | | | | | | | Merge pull request #6830 from bparees/registry_addr | OpenShift Merge Robot | 2018-01-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to set the registr... | Ben Parees | 2018-01-23 | 1 | -1/+1 |
* | | | | | | | | | | Merge pull request #6603 from joelddiaz/fetch_subnet_az | OpenShift Merge Robot | 2018-01-24 | 2 | -2/+19 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | un-hardcode default subnet az | Joel Diaz | 2018-01-22 | 2 | -2/+19 |
* | | | | | | | | | | Merge pull request #6786 from simaishi/cf_46_beta | OpenShift Merge Robot | 2018-01-24 | 24 | -931/+4727 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update CF 4.6 Beta templates in openshift_management directory | Satoe Imaishi | 2018-01-24 | 4 | -29/+415 |
| * | | | | | | | | | | Add templates to v3.9 | Satoe Imaishi | 2018-01-19 | 10 | -451/+2156 |
| * | | | | | | | | | | Use Beta repo path | Satoe Imaishi | 2018-01-18 | 4 | -13/+13 |
| * | | | | | | | | | | CF 4.6 templates | Satoe Imaishi | 2018-01-18 | 10 | -451/+2156 |
* | | | | | | | | | | | Merge pull request #6839 from mtnbikenc/fix-1506866 | OpenShift Merge Robot | 2018-01-24 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | [1506866] Update haproxy.cfg.j2 | Russell Teague | 2018-01-23 | 1 | -1/+2 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #6767 from mazzystr/fix-master-internal-elb | Kenny Woodson | 2018-01-24 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ |