summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5503 from nhosoi/output_config_testOpenShift Merge Robot2017-09-262-0/+4
|\
| * Fluentd: one output tag, one output pluginNoriko Hosoi2017-09-252-0/+4
* | Merge pull request #5530 from ewolinetz/bz1487959OpenShift Merge Robot2017-09-261-4/+16
|\ \
| * | Updating to check for netnamespace kube-service-catalog to be readyEric Wolinetz2017-09-251-4/+16
* | | Automatic commit of package [openshift-ansible] release [3.7.0-0.131.0].Jenkins CD Merge Bot2017-09-262-2/+6
* | | Merge pull request #5529 from abutcher/aggregator-api-client-configOpenShift Merge Robot2017-09-261-11/+29
|\ \ \
| * | | Generate aggregator api client config in temporary directory.Andrew Butcher2017-09-251-11/+29
* | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.130.0].Jenkins CD Merge Bot2017-09-262-2/+5
* | | | Merge pull request #5526 from ewolinetz/tsb_pass_imageOpenShift Merge Robot2017-09-263-4/+10
|\ \ \ \
| * | | | Passing in image parameter for tsb templateEric Wolinetz2017-09-253-4/+10
| | |/ / | |/| |
* | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.129.0].Jenkins CD Merge Bot2017-09-262-2/+6
* | | | Merge pull request #5472 from mgugino-upstream-stage/split-hosted-v2OpenShift Merge Robot2017-09-2629-236/+239
|\ \ \ \
| * | | | Refactor openshift_hosted plays and roleMichael Gugino2017-09-2529-236/+239
* | | | | Merge pull request #5494 from jcantrill/deprecate_escopyOpenShift Merge Robot2017-09-265-6/+3
|\ \ \ \ \
| * | | | | Remove logging ES_COPY featureJeff Cantrill2017-09-225-6/+3
* | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.128.0].Jenkins CD Merge Bot2017-09-262-2/+56
* | | | | | Merge pull request #5519 from giuseppe/crio-set-proper-tagOpenShift Merge Robot2017-09-262-5/+8
|\ \ \ \ \ \
| * | | | | | crio: detect the correct version of the imagesGiuseppe Scrivano2017-09-251-4/+7
| * | | | | | crio: set the correct image name with OSEGiuseppe Scrivano2017-09-251-1/+1
* | | | | | | Merge pull request #5520 from ingvagabund/check-etcd-storage-backendOpenShift Merge Robot2017-09-252-0/+26
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | check if the storage backend is set to etcd3 before upgrading to 3.7Jan Chaloupka2017-09-252-0/+26
| |/ / / / /
* | | | | | Merge pull request #5269 from rparulek/nuage-ansibleOpenShift Merge Robot2017-09-254-19/+5
|\ \ \ \ \ \
| * | | | | | Changes for Nuage atomic ansible installRohan Parulekar2017-09-204-19/+5
* | | | | | | Merge pull request #5205 from mgugino-upstream-stage/docker-etc-containers-regsOpenShift Merge Robot2017-09-255-11/+71
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Move additional/block/insecure registires to /etc/containers/registries.confMichael Gugino2017-09-215-11/+71
* | | | | | | Merge pull request #5415 from ttindell2/masterOpenShift Merge Robot2017-09-254-39/+48
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | GlusterFS can now be run more than once. Ability to add devices to nodesTim Tindell2017-09-184-39/+48
* | | | | | | Merge pull request #5451 from ingvagabund/consolidate-etcd-upgradeOpenShift Merge Robot2017-09-2513-64/+36
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | consolidate etcd_upgrade roleJan Chaloupka2017-09-2113-64/+36
* | | | | | | Merge pull request #5492 from jsafrane/local-storage-predicateOpenShift Merge Robot2017-09-252-1/+32
|\ \ \ \ \ \ \
| * | | | | | | Add 3.7 scheduler predicatesJan Safranek2017-09-202-1/+32
| |/ / / / / /
* | | | | | | Merge pull request #5513 from lucastheisen/masterOpenShift Merge Robot2017-09-251-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | resolve #5428: python-dbus not foundLucas Theisen2017-09-231-1/+1
* | | | | | | Merge pull request #5475 from adammhaile/masterOpenShift Merge Robot2017-09-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use 3.7 RPM repoAdam Haile2017-09-201-1/+1
* | | | | | | | Merge pull request #5501 from giuseppe/crio-skip-nfs-and-lbOpenShift Merge Robot2017-09-241-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | crio: skip installation on lbs and nfs nodesGiuseppe Scrivano2017-09-221-0/+1
* | | | | | | | | Merge pull request #5499 from mtnbikenc/remove-default-callbackOpenShift Merge Robot2017-09-241-70/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove override default.py callback pluginRussell Teague2017-09-221-70/+0
* | | | | | | | | | Merge pull request #5493 from e-minguez/AnsibleUnsafeText_fixOpenShift Merge Robot2017-09-241-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed AnsibleUnsafeText by converting to intEduardo Minguez2017-09-211-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5495 from abutcher/ca-redeploy-expired-etcdOpenShift Merge Robot2017-09-246-31/+100
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Do a full stop/start when etcd certificates had expired.Andrew Butcher2017-09-214-0/+42
| * | | | | | | | | | Improve CA playbook restart logic and skip restarts when related services had...Andrew Butcher2017-09-212-31/+58
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5507 from abutcher/etcd-scaleup-urlsOpenShift Merge Robot2017-09-231-9/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Set master facts prior to adding new etcd client urls to master config.Andrew Butcher2017-09-221-9/+11
* | | | | | | | | | | Merge pull request #5502 from mgugino-upstream-stage/fix-undefined-reg-authOpenShift Merge Robot2017-09-2310-26/+80
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix registry_auth logic for upgradesMichael Gugino2017-09-2210-26/+80
* | | | | | | | | | | | Merge pull request #5460 from ingvagabund/consolidate-etcd-migrate-roleOpenShift Merge Robot2017-09-2318-128/+49
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | consolidate etcd_migrate roleJan Chaloupka2017-09-2218-128/+49