summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5814 from mgugino-upstream-stage/docker-auth-upgradesOpenShift Merge Robot2017-10-243-11/+19
|\
| * Enable oreg_auth credential replace during upgradesMichael Gugino2017-10-193-11/+19
* | Merge pull request #5828 from mgugino-upstream-stage/fix-openid-challengeScott Dodson2017-10-241-1/+0
|\ \
| * | Remove incorrect validation for OpenIDIdentityProviderMichael Gugino2017-10-201-1/+0
* | | Merge pull request #5840 from staebler/service_catalog_role_patchingOpenShift Merge Robot2017-10-241-2/+2
|\ \ \
| * | | Fix edit and admin role patching for service catalogstaebler2017-10-231-2/+2
* | | | Merge pull request #5838 from ingvagabund/strip-dash-when-comparing-versions-...Jan Chaloupka2017-10-241-1/+1
|\ \ \ \
| * | | | strip dash when comparing version with Python3Jan Chaloupka2017-10-231-1/+1
* | | | | Merge pull request #5796 from mgugino-upstream-stage/journald-masters-upgradesOpenShift Merge Robot2017-10-243-22/+28
|\ \ \ \ \
| * | | | | Ensure upgrades apply latest journald settingsMichael Gugino2017-10-183-22/+28
* | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.177.0].Jenkins CD Merge Bot2017-10-242-2/+21
* | | | | | Merge pull request #5808 from zgalor/stateful_setScott Dodson2017-10-234-14/+18
|\ \ \ \ \ \
| * | | | | | Switch to stateful set in prometheusZohar Galor2017-10-234-14/+18
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #5569 from ganhuang/all-hosts-no-proxyScott Dodson2017-10-231-1/+13
|\ \ \ \ \ \
| * | | | | | Generate all internal hostnames of no_proxyGan Huang2017-10-191-1/+13
* | | | | | | Merge pull request #5832 from sdodson/bz1504525Scott Dodson2017-10-232-6/+13
|\ \ \ \ \ \ \
| * | | | | | | verstion_gte seems unreliable on containerized installsScott Dodson2017-10-202-6/+7
| * | | | | | | Retry reconcile in case of error and give up eventuallySimo Sorce2017-10-201-0/+6
* | | | | | | | Merge pull request #5654 from vshn/mastersysconfigvar1OpenShift Merge Robot2017-10-231-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid undefined variable in master sysconfig templateMichael Hanselmann2017-10-191-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #5781 from mgugino-upstream-stage/fix-reg-auth-templatingScott Dodson2017-10-233-3/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Ensure proper variable templating for skopeo auth credentialsMichael Gugino2017-10-173-3/+12
* | | | | | | | | Merge pull request #5811 from zgalor/add_nfs_to_readmeScott Dodson2017-10-231-2/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add nfs variables documentation to README fileZohar Galor2017-10-191-2/+25
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #5845 from ingvagabund/check-correct-master-servicesScott Dodson2017-10-231-12/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Check if the master service is non-ha or notJan Chaloupka2017-10-231-12/+25
* | | | | | | | | | Merge pull request #5822 from ewolinetz/bz1504191Scott Dodson2017-10-231-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Updating ocp es proxy image to use openshift_logging_proxy_image_prefix if sp...Eric Wolinetz2017-10-191-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5453 from giuseppe/use-docker-cli-image-if-already-availableOpenShift Merge Robot2017-10-231-5/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | cli: use the correct name for the master system containerGiuseppe Scrivano2017-10-231-2/+2
| * | | | | | | | | | cli: do not pull again the image when using DockerGiuseppe Scrivano2017-10-231-3/+6
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5844 from mtnbikenc/fix-1504515Scott Dodson2017-10-231-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Correct host group for controller restartRussell Teague2017-10-231-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #5843 from ingvagabund/set-the-correct-etcd-ip-addressScott Dodson2017-10-231-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Set the proper external etcd ip address when migrating embeded etcdJan Chaloupka2017-10-231-1/+1
| |/ / / / / / / / /
* / / / / / / / / / Automatic commit of package [openshift-ansible] release [3.7.0-0.176.0].Jenkins CD Merge Bot2017-10-232-2/+14
|/ / / / / / / / /
* | | | | | | | | Merge pull request #5241 from hansmi/masterScott Dodson2017-10-234-0/+37
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add variable to control whether NetworkManager hook is installedMichael Hanselmann2017-10-194-0/+37
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #5818 from ashcrow/1503860OpenShift Merge Robot2017-10-232-8/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | docker: Move enterprise registry from pkg to mainSteve Milner2017-10-192-8/+9
* | | | | | | | | | Merge pull request #5761 from fabianvf/asb-client-secret-not-foundScott Dodson2017-10-234-22/+24
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Update defaultsFabian von Feilitzsch2017-10-194-5/+9
| * | | | | | | | | Use service-ca.crt instead of master ca.crtFabian von Feilitzsch2017-10-191-16/+11
| * | | | | | | | | use master certFabian von Feilitzsch2017-10-191-2/+2
| * | | | | | | | | Bug 1496426 - add asb-client secret to openshift-ansible-service-broker names...Fabian von Feilitzsch2017-10-191-1/+4
* | | | | | | | | | Merge pull request #5813 from ashcrow/1503903OpenShift Merge Robot2017-10-239-62/+101
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | systemcontainers: Verify atomic.conf proxy is always configuredSteve Milner2017-10-199-62/+101
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.175.0].Jenkins CD Merge Bot2017-10-232-2/+5
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.174.0].Jenkins CD Merge Bot2017-10-222-2/+5
* | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.173.0].Jenkins CD Merge Bot2017-10-222-2/+5