summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Expand)AuthorAgeFilesLines
* Add flannel modules documentationSylvain Baubeau2015-10-274-5/+23
* Only remove IPv4 address from docker bridgeSylvain Baubeau2015-10-271-1/+1
* Remove multiple use_flannel fact definitionSylvain Baubeau2015-10-272-11/+1
* Ensure openshift-sdn and flannel can't be used at the same timeSylvain Baubeau2015-10-271-0/+4
* Add flannel supportSylvain Baubeau2015-10-2714-1/+229
* Merge pull request #726 from sdodson/examples-syncBrenton Leanhardt2015-10-278-12/+85
|\
| * Update imagestreams and quickstarts from originScott Dodson2015-10-228-12/+85
* | Merge pull request #731 from abutcher/proxy-client-configBrenton Leanhardt2015-10-274-6/+18
|\ \
| * | Use standard library for version comparison.Andrew Butcher2015-10-261-4/+7
| * | Move version greater_than_fact into openshift_factsAndrew Butcher2015-10-222-4/+10
| * | Don't include proxy client cert when <3.1 or <1.1Andrew Butcher2015-10-221-2/+3
| * | Add proxy client certs to master config.Andrew Butcher2015-10-222-2/+4
* | | Pylint fixesAndrew Butcher2015-10-261-4/+4
* | | Merge pull request #744 from kwoodson/zbxztypeKenny Woodson2015-10-264-35/+68
|\ \ \
| * | | Adding zabbix type and fixing zabbix agent varsKenny Woodson2015-10-264-35/+68
* | | | Merge pull request #458 from spinolacastro/project_configBrenton Leanhardt2015-10-263-7/+39
|\ \ \ \
| * | | | Fix quotesDiego Castro2015-10-261-1/+1
| * | | | Add missing quotesDiego Castro2015-10-231-6/+6
| * | | | fix merge conflictsDiego Castro2015-10-22120-619/+4713
| |\ \ \ \
| * | | | | Get default values from openshift_factsDiego Castro2015-08-172-6/+34
| * | | | | CleanupDiego Castro2015-08-171-1/+0
| * | | | | Merge remote-tracking branch 'openshift/master' into project_configDiego Castro2015-08-159-7/+42
| |\ \ \ \ \
| * | | | | | Update PR #458 from commentsDiego Castro2015-08-123-30/+14
| * | | | | | Custom Project ConfigDiego Castro2015-08-124-9/+32
* | | | | | | Merge pull request #734 from ejemba/masterBrenton Leanhardt2015-10-261-2/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Adding Docker Log Options capabilitiesejemba2015-10-231-2/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #729 from detiber/handlerRefactorBrenton Leanhardt2015-10-264-7/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | cleanup naming for skipping master and node restart handlersJason DeTiberus2015-10-234-4/+4
| * | | | | Avoid hardcoded 30s pausesJason DeTiberus2015-10-224-7/+6
* | | | | | Merge pull request #730 from detiber/rpmGenBrenton Leanhardt2015-10-221-14/+0
|\ \ \ \ \ \
| * | | | | | Fix test and workaround for rpm generated configsJason DeTiberus2015-10-221-14/+0
| |/ / / / /
* | | | | | Merge pull request #727 from detiber/fixFactsBrenton Leanhardt2015-10-221-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix error in openshift_factsJason DeTiberus2015-10-221-1/+1
| |/ / / /
* | | | | Merge pull request #736 from joelddiaz/cpu_no_pageJoel Diaz2015-10-221-1/+1
|\ \ \ \ \
| * | | | | Lower priority to stop the paging action.Joel Diaz2015-10-221-1/+1
| |/ / / /
* | | | | Merge pull request #728 from sdodson/fix-examplesBrenton Leanhardt2015-10-221-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix openshift_examplesScott Dodson2015-10-221-1/+1
* | | | | Merge pull request #721 from abutcher/fix-routerBrenton Leanhardt2015-10-221-1/+1
|\ \ \ \ \
| * | | | | Conditionally include openshift_router role.Andrew Butcher2015-10-221-1/+1
* | | | | | Merge pull request #723 from mfojtik/patch-1Brenton Leanhardt2015-10-221-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update examples-sync.shMichal Fojtik2015-10-221-1/+1
| * | | | | Update examples-sync.shMichal Fojtik2015-10-221-1/+1
| |/ / / /
* | | | | Merge pull request #678 from sdodson/examplesWesley Hearn2015-10-222-5/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add match online imagestream/template loading to enterpriseScott Dodson2015-10-201-3/+3
| * | | | Adjust the logic as to when examples are deployedScott Dodson2015-10-202-5/+5
* | | | | Remove pylint comment from Sha-Bang. SSH process get hung when calling python...Francisco Gimeno2015-10-211-1/+2
| |/ / / |/| | |
* | | | Merge pull request #571 from dak1n1/routerWesley Hearn2015-10-214-9/+45
|\ \ \ \
| * | | | Support HA or single router, and start work on registryStefanie Forrester2015-10-214-9/+45
* | | | | Merge pull request #715 from kwoodson/zabbKenny Woodson2015-10-213-0/+5
|\ \ \ \ \
| * | | | | Adding delta feature to zbx_itemKenny Woodson2015-10-203-0/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 01:27:37 +0000