summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into logging_cherrypick_3657Eric Wolinetz2017-03-159-16/+38
|\
| * Merge pull request #3629 from ewolinetz/logging_15_cherrypickOpenShift Bot2017-03-158-10/+11
| |\
| | * cherry picking from #3621 #3614 #3627ewolinetz2017-03-108-10/+11
| * | Merge pull request #3646 from vishpat/service-accountOpenShift Bot2017-03-152-0/+23
| |\ \
| | * | Nuage service account handling by single masterVishal Patil2017-03-142-0/+23
| * | | Merge pull request #3634 from kwoodson/raise_on_prep_failuresOpenShift Bot2017-03-152-8/+8
| |\ \ \
| | * | | Raise on dry-run failures.Kenny Woodson2017-03-132-8/+8
* | | | | Cherry picked from #3657ewolinetz2017-03-157-16/+21
|/ / / /
* | | | Merge pull request #3650 from mtnbikenc/fix-routerOpenShift Bot2017-03-151-0/+9
|\ \ \ \
| * | | | Add router svcacct cluster-reader roleRussell Teague2017-03-141-0/+9
* | | | | Merge pull request #3658 from openshift/revert-3620-enable-docker-during-inst...Scott Dodson2017-03-145-23/+16
|\ \ \ \ \
| * | | | | Revert "Enable docker during installation and upgrade by default"Steve Kuznetsov2017-03-145-23/+16
|/ / / / /
* | | | | Merge pull request #3599 from martineg/min_tls_versionOpenShift Bot2017-03-144-0/+45
|\ \ \ \ \
| * | | | | Allow overriding minTLSVersion and cipherSuitesMartin Eggen2017-03-094-0/+45
* | | | | | Merge pull request #3620 from ingvagabund/enable-docker-during-installation-a...Scott Dodson2017-03-145-16/+23
|\ \ \ \ \ \
| * | | | | | enable docker excluder since the time it is installedJan Chaloupka2017-03-135-16/+23
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #3636 from obuisson/tlsv1.2OpenShift Bot2017-03-142-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Force to use TLSv1.2 (related to https://github.com/openshift/openshift-ansib...Olivier Buisson2017-03-132-2/+2
| |/ / / /
* | | | | Merge pull request #3640 from mtnbikenc/refactor-serviceaccountOpenShift Bot2017-03-137-104/+29
|\ \ \ \ \
| * | | | | Refactor and remove openshift_serviceaccountRussell Teague2017-03-137-104/+29
| |/ / / /
* | | | | Merge pull request #3641 from detiber/fixSixErrorOpenShift Bot2017-03-132-1/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Revert module_utils six for openshift_health_checkerJason DeTiberus2017-03-132-1/+4
* | | | | Merge pull request #3645 from ewolinetz/openshift_logging_meta_fixScott Dodson2017-03-131-1/+0
|\ \ \ \ \
| * | | | | Cherry picking from #3644ewolinetz2017-03-131-1/+0
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3622 from kwoodson/remove_incorrect_filesOpenShift Bot2017-03-132-5163/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Removed unused, unwanted, incorrectly committed code.Kenny Woodson2017-03-102-5163/+0
* | | | | Merge pull request #3631 from ingvagabund/validate-excluders-on-non-atomic-onlyOpenShift Bot2017-03-131-13/+16
|\ \ \ \ \
| * | | | | validate excluders on non-atomic hosts onlyJan Chaloupka2017-03-131-13/+16
| | |_|/ / | |/| | |
* | | | | Merge pull request #3637 from sdodson/typoScott Dodson2017-03-131-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix typoScott Dodson2017-03-131-1/+1
|/ / / /
* | | | Merge pull request #3625 from jcantrill/bz1430661_update_metrics_urlOpenShift Bot2017-03-114-0/+45
|\ \ \ \
| * | | | add 'hawkular/metrics' when updating configJeff Cantrill2017-03-101-1/+1
| * | | | update all the mastersJeff Cantrill2017-03-101-0/+8
| * | | | bug 1430661. Update masterConfig metricsPublicURL on installJeff Cantrill2017-03-103-0/+37
* | | | | Merge pull request #3623 from tbielawa/petset_early_fail_againOpenShift Bot2017-03-101-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix incorrect comparison when detecting petsetsTim Bielawa2017-03-101-2/+2
| | |/ / | |/| |
* | | | Merge pull request #3596 from jcantrill/bz1428249_hostmount_fixOpenShift Bot2017-03-106-11/+26
|\ \ \ \
| * | | | bug 1428249. Use ES hostmount storage if it existsJeff Cantrill2017-03-096-11/+26
| | |_|/ | |/| |
* | | | Merge pull request #3610 from ingvagabund/re-enable-excluders-during-installa...Scott Dodson2017-03-103-0/+14
|\ \ \ \
| * | | | re-enable excluders if they are enabled after openshift version detectionJan Chaloupka2017-03-093-0/+14
* | | | | Merge pull request #3615 from ashcrow/nuage-3583OpenShift Bot2017-03-102-2/+2
|\ \ \ \ \
| * | | | | nuage: Move role back to configSteve Milner2017-03-102-2/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #3624 from codificat/fix-readme-containerScott Dodson2017-03-101-7/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Minor updates to README_CONTAINER_IMAGE.mdPep Turró Mauri2017-03-101-7/+7
| |/ / /
* | | | Merge pull request #3616 from richm/missing-searchguard.truststoreOpenShift Bot2017-03-101-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Bug 1428711 - [IntService_public_324] ES pod is unable to read searchguard.tr...Rich Megginson2017-03-091-1/+1
* | | | Merge pull request #3618 from germansosa/masterScott Dodson2017-03-102-2/+2
|\ \ \ \
| * | | | Fix references to openshift_set_node_ip in inventory examplesgermansosa2017-03-102-2/+2
* | | | | Merge pull request #3613 from detiber/module_utils_sixOpenShift Bot2017-03-106-31/+33
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use ansible.compat.six where possibleJason DeTiberus2017-03-094-26/+30
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 13:33:39 +0000