summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #3664 from ewolinetz/logging_cherrypick_3657OpenShift Bot2017-03-167-17/+20
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into logging_cherrypick_3657Eric Wolinetz2017-03-159-16/+38
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Cherry picked from #3657ewolinetz2017-03-157-16/+21
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #3682 from rhcarvalho/doc-run-single-testScott Dodson2017-03-161-10/+60
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Improve CONTRIBUTING guide with testing tricksRodolfo Carvalho2017-03-161-10/+60
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #3673 from sdodson/remove-excluder-statusOpenShift Bot2017-03-163-90/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Since we've decided that we're no longer paying attention to currentScott Dodson2017-03-153-90/+0
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3678 from sdodson/update-versionsScott Dodson2017-03-162-6/+6
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Update versions in example inventoriesScott Dodson2017-03-162-6/+6
|/ / / / / / / /
* | | | | | | | Merge pull request #3670 from detiber/killNotificationsJason DeTiberus2017-03-151-18/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove travis notificationsJason DeTiberus2017-03-151-18/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #3626 from mtnbikenc/module_renameOpenShift Bot2017-03-1511-31/+31
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Renaming oadm_manage_node to oc_adm_manage_nodeRussell Teague2017-03-1011-31/+31
* | | | | | | | Merge pull request #3666 from ingvagabund/dont-asume-openshift_upgrade_target...OpenShift Bot2017-03-151-2/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | don't assume openshift_upgrade_target is in a form d.dJan Chaloupka2017-03-151-2/+6
| | |/ / / / / | |/| | | | |
* | | | | | | 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
* | | | | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |