Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #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 #4124 from ingvagabund/update-etcd-common-readme | OpenShift Bot | 2017-05-10 | 1 | -9/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | polish etcd_common role | Jan Chaloupka | 2017-05-09 | 1 | -9/+28 |
* | | | | | | | Merge pull request #3969 from jarrpa/glusterfs-registry-too | OpenShift Bot | 2017-05-10 | 15 | -225/+380 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | GlusterFS: Allow swapping an existing registry's backend storage | Jose A. Rivera | 2017-05-04 | 6 | -3/+53 |
| * | | | | | | GlusterFS: Allow for a separate registry-specific playbook | Jose A. Rivera | 2017-05-04 | 11 | -220/+308 |
| * | | | | | | GlusterFS: Improve role documentation | Jose A. Rivera | 2017-05-04 | 1 | -1/+10 |
| * | | | | | | 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 |
* | | | | | | | 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 #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 | 9 | -10/+0 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Remove vim configuration from Python files | Rodolfo Carvalho | 2017-05-09 | 9 | -10/+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 #4026 from ewolinetz/cherry_picks_15 | OpenShift Bot | 2017-05-08 | 7 | -13/+51 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Updating logging and metrics to restart api, ha and controllers when updating... | ewolinetz | 2017-04-28 | 5 | -6/+30 |
| * | | | | | Adding defaults for es_indices | ewolinetz | 2017-04-27 | 1 | -2/+2 |
| * | | | | | Updating logic for generating pvcs and their counts to prevent reuse when loo... | ewolinetz | 2017-04-27 | 2 | -7/+21 |
* | | | | | | Merge pull request #4103 from ganhuang/fix_container_engine | OpenShift Bot | 2017-05-05 | 6 | -24/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix 1448368, and some other minors issues | Gan Huang | 2017-05-05 | 6 | -24/+27 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #4093 from richm/mux-result-startup-fix | Scott Dodson | 2017-05-05 | 2 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | mux startup is broken without this fix | Rich Megginson | 2017-05-04 | 2 | -2/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #4077 from ingvagabund/move-etcdctl-profiles-to-etcd-common | Jan Chaloupka | 2017-05-04 | 3 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | move etcdctl.yml from etcd to etcd_common role | Jan Chaloupka | 2017-05-03 | 3 | -1/+3 |
* | | | | | | Merge pull request #4044 from mtnbikenc/clean-cache | OpenShift Bot | 2017-05-04 | 1 | -0/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Ensure repo cache is clean on the first run | Russell Teague | 2017-05-03 | 1 | -0/+17 |
* | | | | | | | Merge pull request #4089 from mtnbikenc/unicode-decode | OpenShift Bot | 2017-05-04 | 28 | -28/+28 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Allow oc_ modules to pass unicode results | Russell Teague | 2017-05-03 | 28 | -28/+28 |
* | | | | | | | | Merge pull request #4071 from ewolinetz/cherry_pick_htpasswd | OpenShift Bot | 2017-05-04 | 1 | -7/+9 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Modified pick from release-1.5 for updating hawkular htpasswd generation | ewolinetz | 2017-05-02 | 1 | -7/+9 |
* | | | | | | | | Merge pull request #4085 from ewolinetz/pick_issue4083 | OpenShift Bot | 2017-05-03 | 5 | -14/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Correctly setting the primary and replica shard count settings | ewolinetz | 2017-05-03 | 5 | -14/+2 |
| | |_|_|/ / / / | |/| | | | | | |