Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Parameterized Calico/Node Arguments | Vincent Schwarzer | 2017-05-18 | 4 | -3/+32 |
* | Merge pull request #4213 from giuseppe/change-requires-to-wants-openvswitch | OpenShift Bot | 2017-05-18 | 2 | -2/+2 |
|\ | |||||
| * | node, systemd: change Requires to Wants for openvswitch | Giuseppe Scrivano | 2017-05-17 | 2 | -2/+2 |
* | | Merge pull request #4216 from ingvagabund/fix-etcd-upgrade-system-container | OpenShift Bot | 2017-05-17 | 1 | -39/+57 |
|\ \ | |||||
| * | | fix etcd_container_version detection | Jan Chaloupka | 2017-05-17 | 1 | -39/+57 |
* | | | Merge pull request #4214 from giuseppe/rename-ENIRONMENT-to-Environment | OpenShift Bot | 2017-05-17 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | systemcontainercustom.conf.j2: use Environment instead of ENVIRONMENT | Giuseppe Scrivano | 2017-05-17 | 1 | -3/+3 |
| |/ / | |||||
* | | | Merge pull request #4127 from VincentS/Calico_Additional_Checks | OpenShift Bot | 2017-05-17 | 1 | -1/+9 |
|\ \ \ | |||||
| * | | | Change based on feedback | Vincent Schwarzer | 2017-05-10 | 1 | -1/+1 |
| * | | | Added additional Calico Network Plugin Checks | Vincent Schwarzer | 2017-05-09 | 1 | -1/+9 |
* | | | | Merge pull request #4221 from sdodson/fix-gpg-key-path | Scott Dodson | 2017-05-17 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix gpg key path in our repo | Scott Dodson | 2017-05-17 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #4199 from smarterclayton/set_image_policy | OpenShift Bot | 2017-05-17 | 2 | -1/+23 |
|\ \ \ \ | |||||
| * | | | | Default image policy on new clusters to on | Clayton Coleman | 2017-05-15 | 2 | -1/+23 |
* | | | | | Merge pull request #4173 from ashcrow/1450310 | OpenShift Bot | 2017-05-17 | 1 | -5/+22 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Add regexp for container-engine lineinfile | Steve Milner | 2017-05-16 | 1 | -0/+5 |
| * | | | | use dest instead of path for lineinfile | Steve Milner | 2017-05-15 | 1 | -6/+6 |
| * | | | | Add NO_PROXY workaround for container-engine atomic command | Steve Milner | 2017-05-15 | 1 | -0/+4 |
| * | | | | Add no_proxy to atomic.conf | Steve Milner | 2017-05-15 | 1 | -1/+9 |
* | | | | | 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 |
|\ \ \ \ \ \ \ |