Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #5796 from mgugino-upstream-stage/journald-masters-upgrades | OpenShift Merge Robot | 2017-10-24 | 2 | -22/+25 |
|\ \ \ | |||||
| * | | | Ensure upgrades apply latest journald settings | Michael Gugino | 2017-10-18 | 2 | -22/+25 |
* | | | | 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 #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 #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 #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 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #5748 from portante/fix-cpu-limits | Scott Dodson | 2017-10-20 | 22 | -65/+151 |
|\ \ \ \ \ | |||||
| * | | | | | Use "requests" for CPU resources instead of limits | Peter Portante | 2017-10-19 | 22 | -65/+151 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #5792 from mgugino-upstream-stage/fix-master-undefined-var | Scott Dodson | 2017-10-20 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Fix undefined variable for master upgrades | Michael Gugino | 2017-10-18 | 1 | -0/+4 |
* | | | | | | Merge pull request #5752 from kwoodson/bz1491399 | Scott Dodson | 2017-10-20 | 1 | -0/+13 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Adding pre check to verify clusterid is set along with cloudprovider when per... | Kenny Woodson | 2017-10-16 | 1 | -0/+13 |
* | | | | | | | Merge pull request #5821 from abutcher/ca-trust-skip-restart | Scott Dodson | 2017-10-20 | 1 | -2/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Check for container runtime prior to restarting when updating system CA trust. | Andrew Butcher | 2017-10-19 | 1 | -2/+14 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #5766 from jcantrill/1489498_preserve_replica_count | Scott Dodson | 2017-10-20 | 6 | -6/+63 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | bug 1489498. preserve replica and shard settings | Jeff Cantrill | 2017-10-17 | 6 | -6/+63 |
* | | | | | | | | Merge pull request #5783 from dymurray/readiness | Scott Dodson | 2017-10-20 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Indentation errors | Dylan Murray | 2017-10-17 | 1 | -14/+14 |
| * | | | | | | | | Bug 1503233 - Add liveness and readiness probe checks to ASB deploymentconfig | Dylan Murray | 2017-10-17 | 1 | -0/+14 |
* | | | | | | | | | Merge pull request #5574 from dulek/containerized_kuryr_support | Scott Dodson | 2017-10-20 | 13 | -2/+704 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | Initial Kuryr support | MichaĆ Dulko | 2017-10-20 | 13 | -2/+704 |
* | | | | | | | | | Merge pull request #5746 from staebler/Bug_1496694_new_resource_names | Scott Dodson | 2017-10-19 | 9 | -71/+123 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | Change to service-signer.crt for template_service_broker CA_BUNDLE | staebler | 2017-10-18 | 2 | -3/+3 |
| * | | | | | | | | Use service-signer.crt for ca_bundle passed to clusterservicebroker | staebler | 2017-10-18 | 2 | -2/+6 |
| * | | | | | | | | Rename ServiceBroker to ClusterServiceBroker for ansible_service_broker task. | staebler | 2017-10-17 | 1 | -2/+2 |
| * | | | | | | | | Add apiserver.crt to service-catalog controller-manager deployment. | staebler | 2017-10-17 | 2 | -0/+21 |