Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix for yedit custom separators | Matt Woodson | 2017-05-10 | 29 | -29/+29 |
| | |||||
* | Merge pull request #4109 from ewolinetz/fix_ocobj_absent | OpenShift Bot | 2017-05-10 | 2 | -2/+2 |
|\ | | | | | Merged by openshift-bot | ||||
| * | 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 | ||||
| * | | 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 |
|\ \ \ | | | | | | | | | Merged by openshift-bot | ||||
| * | | | 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 |
|\ \ \ \ | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | GlusterFS: Allow swapping an existing registry's backend storage | Jose A. Rivera | 2017-05-04 | 8 | -5/+106 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
| * | | | | GlusterFS: Allow for a separate registry-specific playbook | Jose A. Rivera | 2017-05-04 | 21 | -222/+433 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
| * | | | | GlusterFS: Improve role documentation | Jose A. Rivera | 2017-05-04 | 4 | -7/+61 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
| * | | | | hosted_registry: Get correct pod selector for GlusterFS storage | Jose A. Rivera | 2017-05-04 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
| * | | | | hosted registry: Fix typo | Jose A. Rivera | 2017-05-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jose A. Rivera <jarrpa@redhat.com> | ||||
* | | | | | Automatic commit of package [openshift-ansible] release [3.6.67-1]. | Scott Dodson | 2017-05-10 | 2 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag | ||||
* | | | | | Merge pull request #4117 from sdodson/flatten_upgrade_pkgs | OpenShift Bot | 2017-05-10 | 1 | -22/+34 |
|\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | Perform package upgrades in one transaction | Scott Dodson | 2017-05-08 | 1 | -22/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this we were pullining in unbounded dependencies and upgrading to the latest version available in a repo. | ||||
* | | | | | | Merge pull request #4033 from ↵ | Jan Chaloupka | 2017-05-10 | 3 | -40/+58 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ingvagabund/report-docker-image-version-and-excluder-rpm-version [RFE] report and fail if rpm version differs from docker image version | ||||
| * | | | | | | 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 | ||||
| * | | | | | | | byo: correct option name | Giuseppe Scrivano | 2017-05-09 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The correct name is "enabled', not "basicAuditEnabled" Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1439619 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
* | | | | | | | | Merge pull request #4097 from mtnbikenc/fix-version-check | Scott Dodson | 2017-05-10 | 1 | -25/+29 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Properly fail on empty repoquery version checks | ||||
| * | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --keep-version | ||||
* | | | | | | | | Merge pull request #4116 from abutcher/bz1448824 | Jan Chaloupka | 2017-05-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix additional master cert & client config creation | ||||
| * | | | | | | | | 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 | ||||
| * | | | | | | | | | Remove vim configuration from Python files | Rodolfo Carvalho | 2017-05-09 | 19 | -43/+0 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a project where contributors are free to use whatever editor they want and we have linting tools that verify the proper formatting of Python files, it should not be required to have a vim-specific line in Python files. | ||||
* | | | | | | | | | Merge pull request #4106 from ashcrow/1448384 | OpenShift Bot | 2017-05-09 | 2 | -6/+14 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | | | | Use local variables for daemon.json template | Steve Milner | 2017-05-08 | 2 | -6/+14 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using bare lists and dicts this change converts variables into json for use with daemon.json. jinja2 does have an ability to do this in side of templates, however it is only available in 2.9+. Until then the use of ansible's to_json in the playbook is being used. Refs: - http://jinja.pocoo.org/docs/2.9/templates/#tojson - http://docs.ansible.com/ansible/playbooks_filters.html#filters-for-formatting-data | ||||
* | | | | | | | | | 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 | ||||
| * | | | | | | | | | Fix issue with Travis-CI using old pip version | Russell Teague | 2017-05-09 | 1 | -0/+1 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* / | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.62-1]. | Jenkins CD Merge Bot | 2017-05-09 | 2 | -2/+5 |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | / / / / / / | Automatic commit of package [openshift-ansible] release [3.6.61-1]. | Jenkins CD Merge Bot | 2017-05-09 | 2 | -2/+5 |
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.60-1]. | Jenkins CD Merge Bot | 2017-05-08 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.59-1]. | Jenkins CD Merge Bot | 2017-05-08 | 2 | -2/+9 |
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | | | | | | Merge pull request #4026 from ewolinetz/cherry_picks_15 | OpenShift Bot | 2017-05-08 | 7 | -13/+51 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | | Updating logging and metrics to restart api, ha and controllers when ↵ | ewolinetz | 2017-04-28 | 5 | -6/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | updating master config | ||||
| * | | | | | | Adding defaults for es_indices | ewolinetz | 2017-04-27 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Updating logic for generating pvcs and their counts to prevent reuse when ↵ | ewolinetz | 2017-04-27 | 2 | -7/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | looping | ||||
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.58-1]. | Jenkins CD Merge Bot | 2017-05-08 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | | | | | | | Merge pull request #4114 from jupierce/move_images | Scott Dodson | 2017-05-08 | 8 | -0/+0 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Moving Dockerfile content to images dir | ||||
| * | | | | | | Moving Dockerfile content to images dir | jupierce | 2017-05-08 | 8 | -0/+0 |
|/ / / / / / | |||||
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.57-1]. | Jenkins CD Merge Bot | 2017-05-08 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.56-1]. | Jenkins CD Merge Bot | 2017-05-07 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | | | | | | Automatic commit of package [openshift-ansible] release [3.6.55-1]. | Jenkins CD Merge Bot | 2017-05-06 | 2 | -2/+10 |
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Created by command: /usr/bin/tito tag --accept-auto-changelog | ||||
* | | | | | Merge pull request #4103 from ganhuang/fix_container_engine | OpenShift Bot | 2017-05-05 | 6 | -24/+27 |
|\ \ \ \ \ | | | | | | | | | | | | | Merged by openshift-bot | ||||
| * | | | | | 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 | ||||
| * | | | | | mux startup is broken without this fix | Rich Megginson | 2017-05-04 | 2 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #3720 from giuseppe/installer-system-container | Scott Dodson | 2017-05-05 | 10 | -0/+313 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Installer as a system container |