summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add missing quotesDiego Castro2015-10-231-6/+6
* fix merge conflictsDiego Castro2015-10-22204-1240/+6318
|\
| * 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 #691 from jaryn/patch-1Brenton Leanhardt2015-10-221-8/+10
| |\ \
| | * | Add dependencies missing on RHEL 7.1Jaroslav Henner2015-10-131-8/+10
| * | | Merge pull request #713 from brenton/uninstallBrenton Leanhardt2015-10-222-74/+137
| |\ \ \
| | * | | Deleting exited openshift containers and some other minor touch upsBrenton Leanhardt2015-10-221-1/+17
| | * | | Removing the openshift factsBrenton Leanhardt2015-10-221-0/+1
| | * | | Adding *master-api and *master-controllers to the list of units to stopBrenton Leanhardt2015-10-221-19/+25
| | * | | Improvements to uninstallation playbookBrenton Leanhardt2015-10-222-74/+114
| * | | | Merge pull request #721 from abutcher/fix-routerBrenton Leanhardt2015-10-222-4/+4
| |\ \ \ \
| | * | | | Conditionally include openshift_router role.Andrew Butcher2015-10-222-4/+4
| * | | | | 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-223-7/+6
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add match online imagestream/template loading to enterpriseScott Dodson2015-10-201-3/+3
| | * | | Adjust the logic as to when examples are deployedScott Dodson2015-10-203-7/+6
| * | | | Merge pull request #720 from kikov79/masterBrenton Leanhardt2015-10-221-1/+2
| |\ \ \ \
| | * | | | Remove pylint comment from Sha-Bang. SSH process get hung when calling python...Francisco Gimeno2015-10-211-1/+2
| | | |/ / | | |/| |
| * | | | Merge pull request #719 from sdodson/fix-yaml-tabbingBrenton Leanhardt2015-10-221-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix yaml tabbingScott Dodson2015-10-211-1/+1
| |/ / /
| * | | Merge pull request #571 from dak1n1/routerWesley Hearn2015-10-219-25/+69
| |\ \ \
| | * | | Support HA or single router, and start work on registryStefanie Forrester2015-10-219-25/+69
| * | | | Merge pull request #715 from kwoodson/zabbKenny Woodson2015-10-213-0/+5
| |\ \ \ \
| | * | | | Adding delta feature to zbx_itemKenny Woodson2015-10-203-0/+5
| * | | | | Merge pull request #704 from sdodson/sdn-iptablesBrenton Leanhardt2015-10-211-0/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Open 4789/udp when using the SDNScott Dodson2015-10-191-0/+3
| * | | | | Merge pull request #714 from kwoodson/zabbKenny Woodson2015-10-204-32/+38
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Zabbix server stat fixes. enable the proper item types.Kenny Woodson2015-10-204-32/+38
| * | | | | Merge pull request #671 from abutcher/role-bindingsBrenton Leanhardt2015-10-201-1/+14
| |\ \ \ \ \
| | * | | | | Add `oadm reconcile-cluster-role-bindings` to upgrade playbook.Andrew Butcher2015-10-121-1/+14
| * | | | | | Merge pull request #712 from abutcher/fix-yamlWesley Hearn2015-10-201-2/+2
| |\ \ \ \ \ \
| | * | | | | | Fix yaml indentation from use_openshift_sdn conditionalAndrew Butcher2015-10-201-2/+2
| |/ / / / / /
| * | | | | | Merge pull request #529 from sdodson/cockpit-masterWesley Hearn2015-10-205-0/+51
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Add cockpit-ws with cockpit-kubernetes pluginScott Dodson2015-08-285-0/+51
| * | | | | | Merge pull request #589 from sdodson/issue585Brenton Leanhardt2015-10-201-2/+6
| |\ \ \ \ \ \
| | * | | | | | Lookup ansible_ssh_user group for kubeconfig permsScott Dodson2015-10-121-2/+6
| * | | | | | | Merge pull request #711 from jaryn/fix_libvirt_ip_issuesBrenton Leanhardt2015-10-202-2/+2
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Increase sleep when waiting for IP.Jaroslav Henner2015-10-201-1/+1
| | * | | | | | Use runcmd to restart network.Jaroslav Henner2015-10-201-1/+1
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #664 from tomassedovic/disable-network-pluginMarek Mahut2015-10-202-0/+6
| |\ \ \ \ \ \
| | * | | | | | Allow disabling the network plugin configurationTomas Sedovic2015-10-202-0/+6
| |/ / / / / /
| * | | | | | Merge pull request #709 from joelddiaz/reg_fixJoel Diaz2015-10-191-2/+2
| |\ \ \ \ \ \
| | * | | | | | Fix typos on env vars.Joel Diaz2015-10-191-2/+2
| * | | | | | | Merge pull request #708 from twiest/prThomas Wiest2015-10-191-0/+104
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | added a generic playbook (ops-docker-loopback-to-direct-lvm.yml) to convert a...Thomas Wiest2015-10-191-0/+104
| |/ / / / / /