Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5814 from mgugino-upstream-stage/docker-auth-upgrades | OpenShift Merge Robot | 2017-10-24 | 3 | -11/+19 |
|\ | |||||
| * | Enable oreg_auth credential replace during upgrades | Michael Gugino | 2017-10-19 | 3 | -11/+19 |
* | | Merge pull request #5828 from mgugino-upstream-stage/fix-openid-challenge | Scott Dodson | 2017-10-24 | 1 | -1/+0 |
|\ \ | |||||
| * | | Remove incorrect validation for OpenIDIdentityProvider | Michael Gugino | 2017-10-20 | 1 | -1/+0 |
* | | | Merge pull request #5840 from staebler/service_catalog_role_patching | OpenShift Merge Robot | 2017-10-24 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Fix edit and admin role patching for service catalog | staebler | 2017-10-23 | 1 | -2/+2 |
* | | | | Merge pull request #5838 from ingvagabund/strip-dash-when-comparing-versions-... | Jan Chaloupka | 2017-10-24 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | strip dash when comparing version with Python3 | Jan Chaloupka | 2017-10-23 | 1 | -1/+1 |
* | | | | | Merge pull request #5796 from mgugino-upstream-stage/journald-masters-upgrades | OpenShift Merge Robot | 2017-10-24 | 3 | -22/+28 |
|\ \ \ \ \ | |||||
| * | | | | | Ensure upgrades apply latest journald settings | Michael Gugino | 2017-10-18 | 3 | -22/+28 |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.177.0]. | Jenkins CD Merge Bot | 2017-10-24 | 2 | -2/+21 |
* | | | | | | Merge pull request #5808 from zgalor/stateful_set | Scott Dodson | 2017-10-23 | 4 | -14/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Switch to stateful set in prometheus | Zohar Galor | 2017-10-23 | 4 | -14/+18 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #5569 from ganhuang/all-hosts-no-proxy | Scott Dodson | 2017-10-23 | 1 | -1/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Generate all internal hostnames of no_proxy | Gan Huang | 2017-10-19 | 1 | -1/+13 |
* | | | | | | | Merge pull request #5832 from sdodson/bz1504525 | Scott Dodson | 2017-10-23 | 2 | -6/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | verstion_gte seems unreliable on containerized installs | Scott Dodson | 2017-10-20 | 2 | -6/+7 |
| * | | | | | | | Retry reconcile in case of error and give up eventually | Simo Sorce | 2017-10-20 | 1 | -0/+6 |
* | | | | | | | | Merge pull request #5654 from vshn/mastersysconfigvar1 | OpenShift Merge Robot | 2017-10-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Avoid undefined variable in master sysconfig template | Michael Hanselmann | 2017-10-19 | 1 | -1/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #5781 from mgugino-upstream-stage/fix-reg-auth-templating | Scott Dodson | 2017-10-23 | 3 | -3/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Ensure proper variable templating for skopeo auth credentials | Michael Gugino | 2017-10-17 | 3 | -3/+12 |
* | | | | | | | | | Merge pull request #5811 from zgalor/add_nfs_to_readme | Scott Dodson | 2017-10-23 | 1 | -2/+25 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add nfs variables documentation to README file | Zohar Galor | 2017-10-19 | 1 | -2/+25 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #5845 from ingvagabund/check-correct-master-services | Scott Dodson | 2017-10-23 | 1 | -12/+25 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Check if the master service is non-ha or not | Jan Chaloupka | 2017-10-23 | 1 | -12/+25 |
* | | | | | | | | | | Merge pull request #5822 from ewolinetz/bz1504191 | Scott Dodson | 2017-10-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Updating ocp es proxy image to use openshift_logging_proxy_image_prefix if sp... | Eric Wolinetz | 2017-10-19 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #5453 from giuseppe/use-docker-cli-image-if-already-available | OpenShift Merge Robot | 2017-10-23 | 1 | -5/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | cli: use the correct name for the master system container | Giuseppe Scrivano | 2017-10-23 | 1 | -2/+2 |
| * | | | | | | | | | | cli: do not pull again the image when using Docker | Giuseppe Scrivano | 2017-10-23 | 1 | -3/+6 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #5844 from mtnbikenc/fix-1504515 | Scott Dodson | 2017-10-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Correct host group for controller restart | Russell Teague | 2017-10-23 | 1 | -1/+1 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #5843 from ingvagabund/set-the-correct-etcd-ip-address | Scott Dodson | 2017-10-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Set the proper external etcd ip address when migrating embeded etcd | Jan Chaloupka | 2017-10-23 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
* / / / / / / / / / | Automatic commit of package [openshift-ansible] release [3.7.0-0.176.0]. | Jenkins CD Merge Bot | 2017-10-23 | 2 | -2/+14 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #5241 from hansmi/master | Scott Dodson | 2017-10-23 | 4 | -0/+37 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add variable to control whether NetworkManager hook is installed | Michael Hanselmann | 2017-10-19 | 4 | -0/+37 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #5818 from ashcrow/1503860 | OpenShift Merge Robot | 2017-10-23 | 2 | -8/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | docker: Move enterprise registry from pkg to main | Steve Milner | 2017-10-19 | 2 | -8/+9 |
* | | | | | | | | | | Merge pull request #5761 from fabianvf/asb-client-secret-not-found | Scott Dodson | 2017-10-23 | 4 | -22/+24 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | Update defaults | Fabian von Feilitzsch | 2017-10-19 | 4 | -5/+9 |
| * | | | | | | | | | Use service-ca.crt instead of master ca.crt | Fabian von Feilitzsch | 2017-10-19 | 1 | -16/+11 |
| * | | | | | | | | | use master cert | Fabian von Feilitzsch | 2017-10-19 | 1 | -2/+2 |
| * | | | | | | | | | Bug 1496426 - add asb-client secret to openshift-ansible-service-broker names... | Fabian von Feilitzsch | 2017-10-19 | 1 | -1/+4 |
* | | | | | | | | | | Merge pull request #5813 from ashcrow/1503903 | OpenShift Merge Robot | 2017-10-23 | 9 | -62/+101 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | systemcontainers: Verify atomic.conf proxy is always configured | Steve Milner | 2017-10-19 | 9 | -62/+101 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.175.0]. | Jenkins CD Merge Bot | 2017-10-23 | 2 | -2/+5 |
* | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.174.0]. | Jenkins CD Merge Bot | 2017-10-22 | 2 | -2/+5 |
* | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.173.0]. | Jenkins CD Merge Bot | 2017-10-22 | 2 | -2/+5 |