Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3678 from sdodson/update-versions | Scott Dodson | 2017-03-16 | 2 | -6/+6 |
|\ | |||||
| * | Update versions in example inventories | Scott Dodson | 2017-03-16 | 2 | -6/+6 |
|/ | |||||
* | Merge pull request #3670 from detiber/killNotifications | Jason DeTiberus | 2017-03-15 | 1 | -18/+0 |
|\ | |||||
| * | Remove travis notifications | Jason DeTiberus | 2017-03-15 | 1 | -18/+0 |
* | | Merge pull request #3626 from mtnbikenc/module_rename | OpenShift Bot | 2017-03-15 | 11 | -31/+31 |
|\ \ | |||||
| * | | Renaming oadm_manage_node to oc_adm_manage_node | Russell Teague | 2017-03-10 | 11 | -31/+31 |
* | | | Merge pull request #3666 from ingvagabund/dont-asume-openshift_upgrade_target... | OpenShift Bot | 2017-03-15 | 1 | -2/+6 |
|\ \ \ | |_|/ |/| | | |||||
| * | | don't assume openshift_upgrade_target is in a form d.d | Jan Chaloupka | 2017-03-15 | 1 | -2/+6 |
* | | | Merge pull request #3629 from ewolinetz/logging_15_cherrypick | OpenShift Bot | 2017-03-15 | 8 | -10/+11 |
|\ \ \ | |||||
| * | | | cherry picking from #3621 #3614 #3627 | ewolinetz | 2017-03-10 | 8 | -10/+11 |
* | | | | Merge pull request #3646 from vishpat/service-account | OpenShift Bot | 2017-03-15 | 2 | -0/+23 |
|\ \ \ \ | |||||
| * | | | | Nuage service account handling by single master | Vishal Patil | 2017-03-14 | 2 | -0/+23 |
* | | | | | Merge pull request #3634 from kwoodson/raise_on_prep_failures | OpenShift Bot | 2017-03-15 | 2 | -8/+8 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Raise on dry-run failures. | Kenny Woodson | 2017-03-13 | 2 | -8/+8 |
* | | | | | Merge pull request #3650 from mtnbikenc/fix-router | OpenShift Bot | 2017-03-15 | 1 | -0/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Add router svcacct cluster-reader role | Russell Teague | 2017-03-14 | 1 | -0/+9 |
* | | | | | | Merge pull request #3658 from openshift/revert-3620-enable-docker-during-inst... | Scott Dodson | 2017-03-14 | 5 | -23/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert "Enable docker during installation and upgrade by default" | Steve Kuznetsov | 2017-03-14 | 5 | -23/+16 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3599 from martineg/min_tls_version | OpenShift Bot | 2017-03-14 | 4 | -0/+45 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Allow overriding minTLSVersion and cipherSuites | Martin Eggen | 2017-03-09 | 4 | -0/+45 |
* | | | | | | | Merge pull request #3620 from ingvagabund/enable-docker-during-installation-a... | Scott Dodson | 2017-03-14 | 5 | -16/+23 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | enable docker excluder since the time it is installed | Jan Chaloupka | 2017-03-13 | 5 | -16/+23 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3636 from obuisson/tlsv1.2 | OpenShift Bot | 2017-03-14 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Force to use TLSv1.2 (related to https://github.com/openshift/openshift-ansib... | Olivier Buisson | 2017-03-13 | 2 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3640 from mtnbikenc/refactor-serviceaccount | OpenShift Bot | 2017-03-13 | 7 | -104/+29 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Refactor and remove openshift_serviceaccount | Russell Teague | 2017-03-13 | 7 | -104/+29 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #3641 from detiber/fixSixError | OpenShift Bot | 2017-03-13 | 2 | -1/+4 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Revert module_utils six for openshift_health_checker | Jason DeTiberus | 2017-03-13 | 2 | -1/+4 |
* | | | | | | Merge pull request #3645 from ewolinetz/openshift_logging_meta_fix | Scott Dodson | 2017-03-13 | 1 | -1/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Cherry picking from #3644 | ewolinetz | 2017-03-13 | 1 | -1/+0 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #3622 from kwoodson/remove_incorrect_files | OpenShift Bot | 2017-03-13 | 2 | -5163/+0 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Removed unused, unwanted, incorrectly committed code. | Kenny Woodson | 2017-03-10 | 2 | -5163/+0 |
* | | | | | | Merge pull request #3631 from ingvagabund/validate-excluders-on-non-atomic-only | OpenShift Bot | 2017-03-13 | 1 | -13/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | validate excluders on non-atomic hosts only | Jan Chaloupka | 2017-03-13 | 1 | -13/+16 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #3637 from sdodson/typo | Scott Dodson | 2017-03-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix typo | Scott Dodson | 2017-03-13 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #3625 from jcantrill/bz1430661_update_metrics_url | OpenShift Bot | 2017-03-11 | 4 | -0/+45 |
|\ \ \ \ \ | |||||
| * | | | | | add 'hawkular/metrics' when updating config | Jeff Cantrill | 2017-03-10 | 1 | -1/+1 |
| * | | | | | update all the masters | Jeff Cantrill | 2017-03-10 | 1 | -0/+8 |
| * | | | | | bug 1430661. Update masterConfig metricsPublicURL on install | Jeff Cantrill | 2017-03-10 | 3 | -0/+37 |
* | | | | | | Merge pull request #3623 from tbielawa/petset_early_fail_again | OpenShift Bot | 2017-03-10 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Fix incorrect comparison when detecting petsets | Tim Bielawa | 2017-03-10 | 1 | -2/+2 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #3596 from jcantrill/bz1428249_hostmount_fix | OpenShift Bot | 2017-03-10 | 6 | -11/+26 |
|\ \ \ \ \ | |||||
| * | | | | | bug 1428249. Use ES hostmount storage if it exists | Jeff Cantrill | 2017-03-09 | 6 | -11/+26 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #3610 from ingvagabund/re-enable-excluders-during-installa... | Scott Dodson | 2017-03-10 | 3 | -0/+14 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | re-enable excluders if they are enabled after openshift version detection | Jan Chaloupka | 2017-03-09 | 3 | -0/+14 |
* | | | | | Merge pull request #3615 from ashcrow/nuage-3583 | OpenShift Bot | 2017-03-10 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | nuage: Move role back to config | Steve Milner | 2017-03-10 | 2 | -2/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #3624 from codificat/fix-readme-container | Scott Dodson | 2017-03-10 | 1 | -7/+7 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Minor updates to README_CONTAINER_IMAGE.md | Pep TurrĂ³ Mauri | 2017-03-10 | 1 | -7/+7 |
| |/ / / |