Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5664 from jfchevrette/patch-4 | Scott Dodson | 2017-10-04 | 1 | -5/+0 |
|\ | |||||
| * | remove duplicate [OSEv3:children] group | Jean-Francois Chevrette | 2017-10-04 | 1 | -5/+0 |
|/ | |||||
* | Merge pull request #5656 from ephillipe/patch-1 | Scott Dodson | 2017-10-04 | 2 | -2/+2 |
|\ | |||||
| * | Update hosts.ose.example | Erick Almeida | 2017-10-04 | 1 | -1/+1 |
| * | Update hosts.origin.example | Erick Almeida | 2017-10-04 | 1 | -1/+1 |
* | | Merge pull request #5648 from jcantrill/1497401_default_image_versions | Scott Dodson | 2017-10-04 | 2 | -2/+2 |
|\ \ | |/ |/| | |||||
| * | bug 1497401. Default logging and metrics images to 3.7 | Jeff Cantrill | 2017-10-03 | 2 | -2/+2 |
* | | Merge pull request #5641 from mgugino-upstream-stage/fix-hosted-selectors | OpenShift Merge Robot | 2017-10-03 | 2 | -7/+4 |
|\ \ | |||||
| * | | Fix hosted selector variable migration | Michael Gugino | 2017-10-03 | 2 | -7/+4 |
* | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.143.0]. | Jenkins CD Merge Bot | 2017-10-04 | 2 | -2/+6 |
* | | | Merge pull request #5606 from mgugino-upstream-stage/provision-scale-elb-fixe... | OpenShift Merge Robot | 2017-10-03 | 2 | -5/+15 |
|\ \ \ | |||||
| * | | | Fix provisiong scale group and elb logic | Michael Gugino | 2017-09-29 | 4 | -11/+21 |
* | | | | Merge pull request #5632 from mgugino-upstream-stage/limit-version-upgrade-ma... | OpenShift Merge Robot | 2017-10-03 | 6 | -1/+9 |
|\ \ \ \ | |||||
| * | | | | Limit base-package install during master upgrades | Michael Gugino | 2017-10-02 | 6 | -1/+9 |
* | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.142.0]. | Jenkins CD Merge Bot | 2017-10-03 | 2 | -2/+15 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #5633 from mgugino-upstream-stage/fix-node-cloudprovider | OpenShift Merge Robot | 2017-10-03 | 2 | -16/+16 |
|\ \ \ \ | |||||
| * | | | | Move node aws credentials to config.yml | Michael Gugino | 2017-10-02 | 2 | -16/+16 |
* | | | | | Merge pull request #5638 from sdodson/bz1488366 | Scott Dodson | 2017-10-03 | 2 | -0/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Document that nfs_directory must conform to DNS-1123 | Scott Dodson | 2017-10-03 | 2 | -0/+8 |
* | | | | | | Merge pull request #5621 from abutcher/scaleup-portal-net | OpenShift Merge Robot | 2017-10-03 | 1 | -1/+7 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Ensure openshift.common.portal_net updated during scaleup. | Andrew Butcher | 2017-10-02 | 1 | -1/+7 |
* | | | | | | Merge pull request #5490 from giuseppe/set-crio-docker-tag-for-ose | OpenShift Merge Robot | 2017-10-03 | 3 | -9/+35 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | docker: fix some tox warnings | Giuseppe Scrivano | 2017-09-27 | 1 | -6/+6 |
| * | | | | | Require openshift_image_tag in the inventory with openshift-enterprise | Giuseppe Scrivano | 2017-09-27 | 1 | -0/+8 |
| * | | | | | crio: use the image_tag on RHEL | Giuseppe Scrivano | 2017-09-27 | 1 | -2/+11 |
| * | | | | | docker: use the image_tag on RHEL | Giuseppe Scrivano | 2017-09-27 | 1 | -1/+10 |
* | | | | | | Merge pull request #5630 from abutcher/etcd-scaleup-target | OpenShift Merge Robot | 2017-10-03 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use etcd_ip when communicating with the cluster as a peer in etcd scaleup. | Andrew Butcher | 2017-10-02 | 1 | -1/+1 |
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.141.0]. | Jenkins CD Merge Bot | 2017-10-03 | 2 | -2/+7 |
* | | | | | | | Merge pull request #5629 from mgugino-upstream-stage/duplicate-docker-regs | OpenShift Merge Robot | 2017-10-03 | 1 | -2/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Restore registires to /etc/sysconfig/docker | Michael Gugino | 2017-10-02 | 1 | -2/+12 |
* | | | | | | | | Merge pull request #5611 from smarterclayton/update_vars | OpenShift Merge Robot | 2017-10-03 | 4 | -149/+209 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update to the openshift_aws style scheme for variables | Clayton Coleman | 2017-10-01 | 4 | -149/+209 |
* | | | | | | | | | Merge pull request #5614 from mtnbikenc/fix-prometheus | OpenShift Merge Robot | 2017-10-03 | 3 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix Prometheus byo entry point | Russell Teague | 2017-10-02 | 3 | -1/+3 |
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.140.0]. | Jenkins CD Merge Bot | 2017-10-03 | 2 | -2/+6 |
* | | | | | | | | | | Merge pull request #5619 from ashcrow/1497274 | OpenShift Merge Robot | 2017-10-02 | 1 | -1/+10 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | openshift_checks: Fix incorrect list cast | Steve Milner | 2017-10-02 | 1 | -1/+10 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #5608 from jarrpa/empty-option | OpenShift Merge Robot | 2017-10-02 | 30 | -30/+30 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | lib/base: Allow for empty option value | Jose A. Rivera | 2017-09-29 | 30 | -30/+30 |
* | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.139.0]. | Jenkins CD Merge Bot | 2017-10-02 | 2 | -2/+9 |
* | | | | | | | | | | | Merge pull request #5600 from ewolinetz/bz1496352 | OpenShift Merge Robot | 2017-10-02 | 4 | -4/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Reverting using uninstall variables for logging and metrics | Eric Wolinetz | 2017-09-29 | 4 | -4/+2 |
* | | | | | | | | | | | Merge pull request #5562 from ttindell2/master | OpenShift Merge Robot | 2017-10-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Add --image flag to setup-openshift-heketi-storage | Tim Tindell | 2017-09-27 | 1 | -1/+1 |
* | | | | | | | | | | | Merge pull request #5622 from simo5/yammlint | Scott Dodson | 2017-10-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix mispelling in error message yammlint -> yamllint | Simo Sorce | 2017-10-02 | 1 | -1/+1 |
* | | | | | | | | | | | Merge pull request #5510 from abutcher/separate-certs | OpenShift Merge Robot | 2017-10-02 | 34 | -186/+232 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Separate certificate playbooks. | Andrew Butcher | 2017-10-02 | 34 | -186/+232 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.138.0]. | Jenkins CD Merge Bot | 2017-10-02 | 2 | -2/+8 |
| |/ / / / / / / / |/| | | | | | | | |