summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4156 from mwoodson/fix_yedit_sepsOpenShift Bot2017-05-1129-29/+29
|\
| * Fix for yedit custom separatorsMatt Woodson2017-05-1029-29/+29
* | Merge pull request #4152 from sdodson/iptables-defaultOpenShift Bot2017-05-104-4/+4
|\ \
| * | Default to iptables on masterScott Dodson2017-05-104-4/+4
* | | Merge pull request #4118 from mtnbikenc/fix-groupsOpenShift Bot2017-05-103-4/+7
|\ \ \
| * | | Temporarily revert to OSEv3 host group usageRussell Teague2017-05-093-4/+7
* | | | Merge pull request #4131 from ashcrow/1448800Scott Dodson2017-05-1020-48/+152
|\ \ \ \
| * | | | Add service file templates for master and nodeSteve Milner2017-05-096-1/+105
| * | | | Update systemd units to use proper container service nameSteve Milner2017-05-0914-47/+47
* | | | | Merge pull request #4147 from ashcrow/lowercase-trueScott Dodson2017-05-102-2/+3
|\ \ \ \ \
| * | | | | Rename blocked-registries to block-registriesSteve Milner2017-05-101-1/+1
| * | | | | Ensure true is lowercase in daemon.jsonSteve Milner2017-05-102-1/+2
* | | | | | Merge pull request #3967 from jarrpa/oc_volume-docOpenShift Bot2017-05-102-0/+24
|\ \ \ \ \ \
| * | | | | | oc_volume: Add missing parameter documentationJose A. Rivera2017-04-212-0/+24
* | | | | | | Merge pull request #4136 from richm/find-log-driverScott Dodson2017-05-102-1/+7
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | use docker_log_driver and /etc/docker/daemon.json to determine log driverRich Megginson2017-05-092-1/+7
* | | | | | | Merge pull request #4109 from ewolinetz/fix_ocobj_absentOpenShift Bot2017-05-102-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Updating oc_obj to use get instead of getattrewolinetz2017-05-082-2/+2
* | | | | | | | Merge pull request #4129 from rhcarvalho/document-redhat-ci-jobScott Dodson2017-05-101-0/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Note existence of Fedora tests and how to rerunRodolfo Carvalho2017-05-091-0/+9
* | | | | | | | | Merge pull request #4124 from ingvagabund/update-etcd-common-readmeOpenShift Bot2017-05-102-10/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | polish etcd_common roleJan Chaloupka2017-05-092-10/+28
* | | | | | | | | | Merge pull request #3969 from jarrpa/glusterfs-registry-tooOpenShift Bot2017-05-1028-233/+607
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | GlusterFS: Allow swapping an existing registry's backend storageJose A. Rivera2017-05-048-5/+106
| * | | | | | | | | GlusterFS: Allow for a separate registry-specific playbookJose A. Rivera2017-05-0421-222/+433
| * | | | | | | | | GlusterFS: Improve role documentationJose A. Rivera2017-05-044-7/+61
| * | | | | | | | | hosted_registry: Get correct pod selector for GlusterFS storageJose A. Rivera2017-05-041-1/+9
| * | | | | | | | | hosted registry: Fix typoJose A. Rivera2017-05-041-1/+1
* | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.67-1].Scott Dodson2017-05-102-2/+8
* | | | | | | | | | Merge pull request #4117 from sdodson/flatten_upgrade_pkgsOpenShift Bot2017-05-101-22/+34
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Perform package upgrades in one transactionScott Dodson2017-05-081-22/+34
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #4033 from ingvagabund/report-docker-image-version-and-exc...Jan Chaloupka2017-05-103-40/+58
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fail if rpm version != docker image versionJan Chaloupka2017-05-093-40/+58
* | | | | | | | | | Merge pull request #4130 from giuseppe/fix-audit-docScott Dodson2017-05-102-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | byo: correct option nameGiuseppe Scrivano2017-05-092-2/+2
* | | | | | | | | | | Merge pull request #4097 from mtnbikenc/fix-version-checkScott Dodson2017-05-101-25/+29
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Properly fail if OpenShift RPM version is undefinedRussell Teague2017-05-081-25/+29
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.66-1].Scott Dodson2017-05-102-2/+8
* | | | | | | | | | | Merge pull request #4116 from abutcher/bz1448824Jan Chaloupka2017-05-101-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix additional master cert & client config creation.Andrew Butcher2017-05-081-2/+2
* | | | | | | | | | | | Merge pull request #4123 from rhcarvalho/remove-vim-lineRodolfo Carvalho2017-05-1019-43/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove vim configuration from Python filesRodolfo Carvalho2017-05-0919-43/+0
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #4106 from ashcrow/1448384OpenShift Bot2017-05-092-6/+14
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Use local variables for daemon.json templateSteve Milner2017-05-082-6/+14
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #4135 from mtnbikenc/fix-travisScott Dodson2017-05-091-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix issue with Travis-CI using old pip versionRussell Teague2017-05-091-0/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* / | | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.62-1].Jenkins CD Merge Bot2017-05-092-2/+5
|/ / / / / / / / /
* | / / / / / / / Automatic commit of package [openshift-ansible] release [3.6.61-1].Jenkins CD Merge Bot2017-05-092-2/+5
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.60-1].Jenkins CD Merge Bot2017-05-082-2/+5
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.6.59-1].Jenkins CD Merge Bot2017-05-082-2/+9
| |_|/ / / / / |/| | | | | |