summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6860 from jpeeler/aggregate-name-changeScott Dodson2018-01-294-106/+97
|\
| * Change catalog roles install to use aggregationJeff Peeler2018-01-244-106/+97
* | Merge pull request #6889 from mazzystr/fix-port-alignmentOpenShift Merge Robot2018-01-295-63/+82
|\ \
| * | Fix misaligned ports for sg,elb,apiChris Callegari2018-01-255-63/+82
* | | Merge pull request #6215 from sdodson/bz1511870OpenShift Merge Robot2018-01-292-0/+5
|\ \ \
| * | | Make IP object a stringFabian von Feilitzsch2018-01-241-1/+2
| * | | Add kube service ipaddress to no_proxy listScott Dodson2018-01-242-0/+4
* | | | Merge pull request #6909 from spadgett/detect-croOpenShift Merge Robot2018-01-291-1/+6
|\ \ \ \
| * | | | Bug 1539182: Detect if ClusterResourceOverrides enabled during console installSamuel Padgett2018-01-271-1/+6
* | | | | Merge pull request #6811 from mjudeikis/prometheus-new-templateOpenShift Merge Robot2018-01-299-142/+283
|\ \ \ \ \
| * | | | | Rebase Prometheus example for new scrape endpoints and expose alert managerMangirdas2018-01-289-142/+283
* | | | | | Merge pull request #6913 from openshift/revert-6830-registry_addrOpenShift Merge Robot2018-01-271-1/+1
|\ \ \ \ \ \
| * | | | | | Revert "use non-deprecated REGISTRY_OPENSHIFT_SERVER_ADDR variable to set the...Ben Parees2018-01-271-1/+1
|/ / / / / /
* | | | | | Merge pull request #6886 from smarterclayton/playbooks/gcp/openshift-cluster/...OpenShift Merge Robot2018-01-271-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add GPG keys in the base image and don't install dockerClayton Coleman2018-01-251-1/+2
* | | | | | Merge pull request #6905 from mgugino-upstream-stage/fix-crt-typoOpenShift Merge Robot2018-01-271-1/+1
|\ \ \ \ \ \
| * | | | | | Fix container_runtime variable typoMichael Gugino2018-01-261-1/+1
* | | | | | | Merge pull request #6896 from mgugino-upstream-stage/fix-upgrade-image-tagOpenShift Merge Robot2018-01-263-5/+29
|\ \ \ \ \ \ \
| * | | | | | | Correct 3.7 to 3.9 upgrade openshift_image_tagMichael Gugino2018-01-263-5/+29
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.31.0].Jenkins CD Merge Bot2018-01-272-2/+9
* | | | | | | | Merge pull request #6840 from yocum137/rm_origin-componentsOpenShift Merge Robot2018-01-2613-11/+3
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of github.com:openshift/openshift-ansible into rm_origi...Dan Yocum2018-01-2674-398/+1389
| |\ \ \ \ \ \ \ \
| * | | | | | | | | removed references to 'files' dir in spec fileDan Yocum2018-01-261-4/+0
| * | | | | | | | | files in ansible roles do not need to have the path specified to themDan Yocum2018-01-245-7/+3
| * | | | | | | | | Merge branch 'master' into rm_origin-componentsDan Yocum2018-01-24111-1158/+6509
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | moving files to their correct <role>/files dir for the openshift_web_console ...Dan Yocum2018-01-239-2/+2
* | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.30.0].Jenkins CD Merge Bot2018-01-262-2/+5
* | | | | | | | | | Merge pull request #6888 from kwoodson/fix_overlay_nodriveOpenShift Merge Robot2018-01-262-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removing dependency on the extra stroage device.Kenny Woodson2018-01-252-1/+5
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.29.0].Jenkins CD Merge Bot2018-01-262-2/+7
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #6893 from spadgett/console-requestsScott Dodson2018-01-261-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add prometheus annotations to console serviceSamuel Padgett2018-01-261-0/+2
| * | | | | | | | | | Add resource requests to console templateSamuel Padgett2018-01-261-0/+4
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #6871 from joelddiaz/oc_group_ignore_usersOpenShift Merge Robot2018-01-262-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ignore 'users' field in oc_group moduleJoel Diaz2018-01-252-2/+2
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.28.0].Jenkins CD Merge Bot2018-01-262-2/+6
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #6862 from ewolinetz/deprecate_use_callbackOpenShift Merge Robot2018-01-263-12/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Updating deprecations to use callback pluginEric Wolinetz2018-01-254-12/+11
* | | | | | | | | | | Merge pull request #6882 from spadgett/console-node-selectorOpenShift Merge Robot2018-01-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Run console pods on the masterSamuel Padgett2018-01-251-1/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.26.0].Jenkins CD Merge Bot2018-01-262-2/+7
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #6821 from spadgett/remove-asset-configScott Dodson2018-01-268-43/+81
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove old assetConfig from master-config.yamlSamuel Padgett2018-01-257-43/+78
| * | | | | | | | | | Don't emit assetConfig on 3.9Scott Dodson2018-01-251-0/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #6880 from sosiouxme/20180115-docker-image-locationsOpenShift Merge Robot2018-01-262-13/+47
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | docker_image_availability: containerized overridesLuke Meyer2018-01-252-13/+47
| |/ / / / / / / /
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.9.0-0.25.0].Jenkins CD Merge Bot2018-01-262-2/+23
* | | | | | | | | Merge pull request #6857 from mtnbikenc/fix-1537946OpenShift Merge Robot2018-01-251-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [1537946] Correct conditional check for GlusterFS IPsRussell Teague2018-01-241-1/+2
* | | | | | | | | | Merge pull request #6875 from bparees/syncOpenShift Merge Robot2018-01-2521-127/+746
|\ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 05:10:24 +0000