Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | Merge pull request #5700 from wozniakjan/bz_1452939 | OpenShift Merge Robot | 2017-10-24 | 14 | -14/+164 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Bug 1452939 - change Logging & Metrics imagePullPolicy | Jan Wozniak | 2017-10-23 | 14 | -14/+164 | |
* | | | | | | | | | | | | | | | | Merge pull request #5806 from staebler/service_catalog_uninstall_issues | OpenShift Merge Robot | 2017-10-24 | 7 | -17/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Remove extraneous spaces that yamllint dislikes | staebler | 2017-10-23 | 1 | -3/+3 | |
| * | | | | | | | | | | | | | | | Remove role bindings during service catalog un-install | staebler | 2017-10-22 | 5 | -15/+28 | |
| * | | | | | | | | | | | | | | | Fix a few small issues in service catalog uninstall | staebler | 2017-10-22 | 3 | -6/+23 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge pull request #5814 from mgugino-upstream-stage/docker-auth-upgrades | OpenShift Merge Robot | 2017-10-24 | 2 | -11/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Enable oreg_auth credential replace during upgrades | Michael Gugino | 2017-10-19 | 2 | -11/+13 | |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | 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 |