Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |/ / / | |||||
* | | | | Merge pull request #3616 from richm/missing-searchguard.truststore | OpenShift Bot | 2017-03-10 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Bug 1428711 - [IntService_public_324] ES pod is unable to read searchguard.tr... | Rich Megginson | 2017-03-09 | 1 | -1/+1 |
* | | | | Merge pull request #3618 from germansosa/master | Scott Dodson | 2017-03-10 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Fix references to openshift_set_node_ip in inventory examples | germansosa | 2017-03-10 | 2 | -2/+2 |
* | | | | | Merge pull request #3613 from detiber/module_utils_six | OpenShift Bot | 2017-03-10 | 6 | -31/+33 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Use ansible.compat.six where possible | Jason DeTiberus | 2017-03-09 | 4 | -26/+30 |
| * | | | | Use six from ansible.module_utils for remote hosts | Jason DeTiberus | 2017-03-09 | 5 | -8/+6 |
* | | | | | Merge pull request #3600 from tbielawa/etcd_is_atomic-BZ1427067 | OpenShift Bot | 2017-03-09 | 4 | -2/+20 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Remove debug task | Tim Bielawa | 2017-03-09 | 1 | -3/+0 |
| * | | | | New role | Tim Bielawa | 2017-03-08 | 4 | -2/+23 |
* | | | | | Merge pull request #3605 from kwoodson/oc_adm_policy_user_fix | OpenShift Bot | 2017-03-09 | 6 | -54/+5319 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fixing the way policies are found. The old method was unreliable. This meth... | Kenny Woodson | 2017-03-08 | 6 | -54/+5319 |
| |/ / / | |||||
* | | | | Merge pull request #3590 from kwoodson/router_registry_unit_tests | Andrew Butcher | 2017-03-09 | 26 | -51/+915 |
|\ \ \ \ | |||||
| * | | | | Lowering test coverage percentage. | Kenny Woodson | 2017-03-08 | 1 | -1/+1 |
| * | | | | Removing ordereddict. Replaced with sorted keys. | Kenny Woodson | 2017-03-08 | 26 | -95/+97 |
| * | | | | Fixed for linting. | Kenny Woodson | 2017-03-08 | 2 | -5/+1 |
| * | | | | Fix to OpenshiftCLIConfig to support an ordereddict. This was breaking test ... | Kenny Woodson | 2017-03-07 | 26 | -115/+420 |
| * | | | | Adding test_oc_adm_router. | Kenny Woodson | 2017-03-07 | 1 | -0/+476 |
| * | | | | Adding router test. | Kenny Woodson | 2017-03-07 | 1 | -0/+85 |
* | | | | | Merge pull request #3586 from srampal/issue3541 | Scott Dodson | 2017-03-09 | 4 | -1/+36 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Fix for issue 3541 | Sanjeev Rampal | 2017-03-07 | 4 | -1/+36 |
* | | | | | Merge pull request #3607 from ingvagabund/extend-excluders-to-containerized-ocp | Jan Chaloupka | 2017-03-09 | 6 | -6/+6 |
|\ \ \ \ \ | |||||
| * | | | | | extend the excluders to containerized deployment | Jan Chaloupka | 2017-03-09 | 6 | -6/+6 |
|/ / / / / | |||||
* | | | | | Merge pull request #3604 from sdodson/issue3603 | Scott Dodson | 2017-03-08 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | openshift_excluders depends on openshift_repos | Scott Dodson | 2017-03-08 | 1 | -0/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #3601 from mmckinst/etcd_version | OpenShift Bot | 2017-03-08 | 5 | -3/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | add ability to specify an etcd version | Mark McKinstry | 2017-03-08 | 5 | -3/+7 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #3589 from brenton/master | Scott Dodson | 2017-03-08 | 2 | -0/+142 |
|\ \ \ \ |