Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | doc: Add link to daemon.json upstream doc | Steve Milner | 2017-05-11 | 1 | -0/+2 |
* | Remove unused daemon.json keys | Steve Milner | 2017-05-11 | 1 | -45/+0 |
* | Merge pull request #4158 from ganhuang/lower_bool | Scott Dodson | 2017-05-11 | 1 | -2/+2 |
|\ | |||||
| * | lower case in /etc/daemon.json and correct block-registry | Gan Huang | 2017-05-11 | 1 | -2/+2 |
* | | Merge pull request #4156 from mwoodson/fix_yedit_seps | OpenShift Bot | 2017-05-11 | 29 | -29/+29 |
|\ \ | |||||
| * | | Fix for yedit custom separators | Matt Woodson | 2017-05-10 | 29 | -29/+29 |
* | | | Merge pull request #4152 from sdodson/iptables-default | OpenShift Bot | 2017-05-10 | 4 | -4/+4 |
|\ \ \ | |||||
| * | | | Default to iptables on master | Scott Dodson | 2017-05-10 | 4 | -4/+4 |
* | | | | Merge pull request #4118 from mtnbikenc/fix-groups | OpenShift Bot | 2017-05-10 | 3 | -4/+7 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Temporarily revert to OSEv3 host group usage | Russell Teague | 2017-05-09 | 3 | -4/+7 |
* | | | | Merge pull request #4131 from ashcrow/1448800 | Scott Dodson | 2017-05-10 | 20 | -48/+152 |
|\ \ \ \ | |||||
| * | | | | Add service file templates for master and node | Steve Milner | 2017-05-09 | 6 | -1/+105 |
| * | | | | Update systemd units to use proper container service name | Steve Milner | 2017-05-09 | 14 | -47/+47 |
* | | | | | Merge pull request #4147 from ashcrow/lowercase-true | Scott Dodson | 2017-05-10 | 2 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Rename blocked-registries to block-registries | Steve Milner | 2017-05-10 | 1 | -1/+1 |
| * | | | | | Ensure true is lowercase in daemon.json | Steve Milner | 2017-05-10 | 2 | -1/+2 |
* | | | | | | Merge pull request #3967 from jarrpa/oc_volume-doc | OpenShift Bot | 2017-05-10 | 2 | -0/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | oc_volume: Add missing parameter documentation | Jose A. Rivera | 2017-04-21 | 2 | -0/+24 |
* | | | | | | | Merge pull request #4136 from richm/find-log-driver | Scott Dodson | 2017-05-10 | 2 | -1/+7 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | use docker_log_driver and /etc/docker/daemon.json to determine log driver | Rich Megginson | 2017-05-09 | 2 | -1/+7 |
* | | | | | | | Merge pull request #4109 from ewolinetz/fix_ocobj_absent | OpenShift Bot | 2017-05-10 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Updating oc_obj to use get instead of getattr | ewolinetz | 2017-05-08 | 2 | -2/+2 |
* | | | | | | | | Merge pull request #4129 from rhcarvalho/document-redhat-ci-job | Scott Dodson | 2017-05-10 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Note existence of Fedora tests and how to rerun | Rodolfo Carvalho | 2017-05-09 | 1 | -0/+9 |
* | | | | | | | | | Merge pull request #4124 from ingvagabund/update-etcd-common-readme | OpenShift Bot | 2017-05-10 | 2 | -10/+28 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | polish etcd_common role | Jan Chaloupka | 2017-05-09 | 2 | -10/+28 |
* | | | | | | | | | | Merge pull request #3969 from jarrpa/glusterfs-registry-too | OpenShift Bot | 2017-05-10 | 28 | -233/+607 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | GlusterFS: Allow swapping an existing registry's backend storage | Jose A. Rivera | 2017-05-04 | 8 | -5/+106 |
| * | | | | | | | | | GlusterFS: Allow for a separate registry-specific playbook | Jose A. Rivera | 2017-05-04 | 21 | -222/+433 |
| * | | | | | | | | | GlusterFS: Improve role documentation | Jose A. Rivera | 2017-05-04 | 4 | -7/+61 |
| * | | | | | | | | | hosted_registry: Get correct pod selector for GlusterFS storage | Jose A. Rivera | 2017-05-04 | 1 | -1/+9 |
| * | | | | | | | | | hosted registry: Fix typo | Jose A. Rivera | 2017-05-04 | 1 | -1/+1 |
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.67-1]. | Scott Dodson | 2017-05-10 | 2 | -2/+8 |
* | | | | | | | | | | Merge pull request #4117 from sdodson/flatten_upgrade_pkgs | OpenShift Bot | 2017-05-10 | 1 | -22/+34 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Perform package upgrades in one transaction | Scott Dodson | 2017-05-08 | 1 | -22/+34 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #4033 from ingvagabund/report-docker-image-version-and-exc... | Jan Chaloupka | 2017-05-10 | 3 | -40/+58 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fail if rpm version != docker image version | Jan Chaloupka | 2017-05-09 | 3 | -40/+58 |
* | | | | | | | | | | Merge pull request #4130 from giuseppe/fix-audit-doc | Scott Dodson | 2017-05-10 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | byo: correct option name | Giuseppe Scrivano | 2017-05-09 | 2 | -2/+2 |
* | | | | | | | | | | | Merge pull request #4097 from mtnbikenc/fix-version-check | Scott Dodson | 2017-05-10 | 1 | -25/+29 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Properly fail if OpenShift RPM version is undefined | Russell Teague | 2017-05-08 | 1 | -25/+29 |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.66-1]. | Scott Dodson | 2017-05-10 | 2 | -2/+8 |
* | | | | | | | | | | | Merge pull request #4116 from abutcher/bz1448824 | Jan Chaloupka | 2017-05-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix additional master cert & client config creation. | Andrew Butcher | 2017-05-08 | 1 | -2/+2 |
* | | | | | | | | | | | | Merge pull request #4123 from rhcarvalho/remove-vim-line | Rodolfo Carvalho | 2017-05-10 | 19 | -43/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Remove vim configuration from Python files | Rodolfo Carvalho | 2017-05-09 | 19 | -43/+0 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #4106 from ashcrow/1448384 | OpenShift Bot | 2017-05-09 | 2 | -6/+14 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Use local variables for daemon.json template | Steve Milner | 2017-05-08 | 2 | -6/+14 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #4135 from mtnbikenc/fix-travis | Scott Dodson | 2017-05-09 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix issue with Travis-CI using old pip version | Russell Teague | 2017-05-09 | 1 | -0/+1 |
| | |_|_|_|/ / / / / | |/| | | | | | | | |