Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.172.0]. | Jenkins CD Merge Bot | 2017-10-22 | 2 | -2/+5 | |
* | | | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.171.0]. | Jenkins CD Merge Bot | 2017-10-21 | 2 | -2/+11 | |
* | | | | | | | | | | | | | Merge pull request #5748 from portante/fix-cpu-limits | Scott Dodson | 2017-10-20 | 23 | -68/+154 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Use "requests" for CPU resources instead of limits | Peter Portante | 2017-10-19 | 23 | -68/+154 | |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | 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 #5794 from kwoodson/bz1501271 | Scott Dodson | 2017-10-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | [bz1501271] Attempt to use ami ssh user and default to ansible_ssh_user. | Kenny Woodson | 2017-10-18 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.170.0]. | Jenkins CD Merge Bot | 2017-10-20 | 2 | -2/+8 | |
* | | | | | | | | | | | | | | | 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 #5749 from abutcher/servinginfo-client-ca-upgrade | OpenShift Merge Robot | 2017-10-20 | 2 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Set servingInfo.clientCA to ca.crt during upgrade. | Andrew Butcher | 2017-10-17 | 2 | -0/+10 | |
* | | | | | | | | | | | | | | | | | | Automatic commit of package [openshift-ansible] release [3.7.0-0.169.0]. | Jenkins CD Merge Bot | 2017-10-20 | 2 | -2/+8 | |
* | | | | | | | | | | | | | | | | | | 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 |