Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | systemcontainercustom.conf.j2: use Environment instead of ENVIRONMENT | Giuseppe Scrivano | 2017-05-17 | 1 | -3/+3 |
* | Merge pull request #4189 from giuseppe/fix-atomic-host | OpenShift Bot | 2017-05-17 | 1 | -3/+8 |
|\ | |||||
| * | openshift_version: skip rpm version==image version on Atomic | Giuseppe Scrivano | 2017-05-15 | 1 | -3/+8 |
* | | Merge pull request #4144 from VincentS/Calico_Remove_Hardcoded_URLs | Jan Chaloupka | 2017-05-17 | 2 | -3/+7 |
|\ \ | |||||
| * | | Removed Hardcoded Calico URLs | Vincent Schwarzer | 2017-05-10 | 2 | -3/+7 |
* | | | Merge pull request #4197 from abutcher/oc_adm_ca_server_cert-hostnames-omit | OpenShift Bot | 2017-05-16 | 3 | -0/+16 |
|\ \ \ | |||||
| * | | | Filter non-strings from the oc_adm_ca_server_cert hostnames parameter. | Andrew Butcher | 2017-05-15 | 3 | -0/+16 |
* | | | | Merge pull request #4196 from dmsimard/paas_repo | OpenShift Bot | 2017-05-16 | 1 | -2/+6 |
|\ \ \ \ | |||||
| * | | | | Don't set-up origin repositories if they've already been configured | David Moreau-Simard | 2017-05-15 | 1 | -2/+6 |
* | | | | | Merge pull request #4185 from donnydavis/patch-1 | OpenShift Bot | 2017-05-16 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed for python3 with Fedora 25 Atomic | Donny Davis | 2017-05-14 | 1 | -1/+1 |
* | | | | | | Merge pull request #4178 from mtnbikenc/fix-templating | OpenShift Bot | 2017-05-16 | 7 | -2/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix templating of static service files | Russell Teague | 2017-05-12 | 7 | -2/+3 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #4187 from giuseppe/uninstall-container-engine | OpenShift Bot | 2017-05-15 | 1 | -0/+7 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | uninstall: handle container-engine | Giuseppe Scrivano | 2017-05-15 | 1 | -0/+7 |
* | | | | | | Merge pull request #4193 from ashcrow/1448998 | Scott Dodson | 2017-05-15 | 2 | -8/+8 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | byo inventory versions 1.5 -> 3.6 | Steve Milner | 2017-05-15 | 1 | -4/+4 |
| * | | | | | byo inventory versions 3.5 -> 3.6 | Steve Milner | 2017-05-15 | 1 | -4/+4 |
|/ / / / / | |||||
* | | | | | Merge pull request #4184 from ashcrow/rslave | OpenShift Bot | 2017-05-14 | 2 | -12/+16 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Add docker package for container-engine install | Steve Milner | 2017-05-14 | 2 | -12/+16 |
|/ / / / | |||||
* | | | | Automatic commit of package [openshift-ansible] release [3.6.68-1]. | Jenkins CD Merge Bot | 2017-05-13 | 2 | -2/+50 |
* | | | | Merge pull request #4113 from jcantrill/bz1448860_make_recovery_after_nodes_t... | OpenShift Bot | 2017-05-13 | 3 | -14/+6 |
|\ \ \ \ | |||||
| * | | | | bug 1448860. Change recovery_after_nodes to match node_quorum | Jeff Cantrill | 2017-05-11 | 3 | -14/+6 |
* | | | | | Merge pull request #4155 from ewolinetz/registry_console_upgrade | OpenShift Bot | 2017-05-13 | 1 | -0/+22 |
|\ \ \ \ \ | |||||
| * | | | | | Updating registry-console image version during a post_control_plane upgrade | ewolinetz | 2017-05-12 | 1 | -0/+22 |
* | | | | | | Merge pull request #4174 from ashcrow/remove-userland-proxy | OpenShift Bot | 2017-05-12 | 1 | -2/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove userland-proxy-path from daemon.json | Steve Milner | 2017-05-12 | 1 | -2/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #4172 from ashcrow/1450307 | OpenShift Bot | 2017-05-12 | 3 | -12/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix whistespace issues in custom template | Steve Milner | 2017-05-12 | 1 | -6/+6 |
| * | | | | | | Always add proxy items to atomic.conf | Steve Milner | 2017-05-12 | 1 | -4/+1 |
| * | | | | | | Move container-engine systemd environment to updated location | Steve Milner | 2017-05-12 | 2 | -2/+3 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4030 from liggitt/reserved-namespaces | OpenShift Bot | 2017-05-12 | 2 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Reserve kubernetes and 'kubernetes-' prefixed namespaces | Jordan Liggitt | 2017-04-27 | 2 | -0/+4 |
* | | | | | | | Merge pull request #4162 from jcantrill/bz1439451_kibana_crash | OpenShift Bot | 2017-05-12 | 2 | -10/+33 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | bug 1441369. Kibana memory limits | Jeff Cantrill | 2017-05-11 | 2 | -10/+33 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #4126 from VincentS/SDN_Check_Fix | Jan Chaloupka | 2017-05-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix for OpenShift SDN Check | Vincent Schwarzer | 2017-05-09 | 1 | -1/+1 |
* | | | | | | | Merge pull request #4065 from ingvagabund/introduce-get-rpm-version-role | Jan Chaloupka | 2017-05-12 | 13 | -67/+106 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Extend repoquery command (of lib_utils role) to ignore excluders | Jan Chaloupka | 2017-05-11 | 13 | -67/+106 |
* | | | | | | | | Merge pull request #3879 from ingvagabund/run-excluders-on-selected-hosts-only | Jan Chaloupka | 2017-05-12 | 21 | -54/+100 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | run excluders over selected set of hosts during control_plane/node upgrade | Jan Chaloupka | 2017-05-03 | 21 | -54/+100 |
* | | | | | | | | Merge pull request #4164 from ashcrow/simplify-daemon-json | OpenShift Bot | 2017-05-11 | 2 | -45/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | doc: Add link to daemon.json upstream doc | Steve Milner | 2017-05-11 | 1 | -0/+2 |
| * | | | | | | | | Remove unused daemon.json keys | Steve Milner | 2017-05-11 | 1 | -45/+0 |
* | | | | | | | | | Merge pull request #4115 from ewolinetz/metrics_limits_docs | OpenShift Bot | 2017-05-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Updating size suffix for metrics in role | ewolinetz | 2017-05-08 | 1 | -1/+1 |
* | | | | | | | | | | Merge pull request #4153 from ewolinetz/bz1449554 | OpenShift Bot | 2017-05-11 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Updating 3.6 enterprise registry-console template image version | ewolinetz | 2017-05-10 | 1 | -2/+2 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #4158 from ganhuang/lower_bool | Scott Dodson | 2017-05-11 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | lower case in /etc/daemon.json and correct block-registry | Gan Huang | 2017-05-11 | 1 | -2/+2 |