summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4214 from giuseppe/rename-ENIRONMENT-to-EnvironmentOpenShift Bot2017-05-171-3/+3
|\
| * systemcontainercustom.conf.j2: use Environment instead of ENVIRONMENTGiuseppe Scrivano2017-05-171-3/+3
* | Merge pull request #4127 from VincentS/Calico_Additional_ChecksOpenShift Bot2017-05-171-1/+9
|\ \
| * | Change based on feedbackVincent Schwarzer2017-05-101-1/+1
| * | Added additional Calico Network Plugin ChecksVincent Schwarzer2017-05-091-1/+9
* | | Merge pull request #4221 from sdodson/fix-gpg-key-pathScott Dodson2017-05-171-1/+1
|\ \ \
| * | | Fix gpg key path in our repoScott Dodson2017-05-171-1/+1
| | |/ | |/|
* | | Merge pull request #4199 from smarterclayton/set_image_policyOpenShift Bot2017-05-172-1/+23
|\ \ \
| * | | Default image policy on new clusters to onClayton Coleman2017-05-152-1/+23
* | | | Merge pull request #4173 from ashcrow/1450310OpenShift Bot2017-05-171-5/+22
|\ \ \ \ | |_|/ / |/| | |
| * | | Add regexp for container-engine lineinfileSteve Milner2017-05-161-0/+5
| * | | use dest instead of path for lineinfileSteve Milner2017-05-151-6/+6
| * | | Add NO_PROXY workaround for container-engine atomic commandSteve Milner2017-05-151-0/+4
| * | | Add no_proxy to atomic.confSteve Milner2017-05-151-1/+9
* | | | Merge pull request #4189 from giuseppe/fix-atomic-hostOpenShift Bot2017-05-171-3/+8
|\ \ \ \
| * | | | openshift_version: skip rpm version==image version on AtomicGiuseppe Scrivano2017-05-151-3/+8
| |/ / /
* | | | Merge pull request #4144 from VincentS/Calico_Remove_Hardcoded_URLsJan Chaloupka2017-05-172-3/+7
|\ \ \ \
| * | | | Removed Hardcoded Calico URLsVincent Schwarzer2017-05-102-3/+7
* | | | | Merge pull request #4197 from abutcher/oc_adm_ca_server_cert-hostnames-omitOpenShift Bot2017-05-163-0/+16
|\ \ \ \ \
| * | | | | Filter non-strings from the oc_adm_ca_server_cert hostnames parameter.Andrew Butcher2017-05-153-0/+16
* | | | | | Merge pull request #4196 from dmsimard/paas_repoOpenShift Bot2017-05-161-2/+6
|\ \ \ \ \ \
| * | | | | | Don't set-up origin repositories if they've already been configuredDavid Moreau-Simard2017-05-151-2/+6
* | | | | | | Merge pull request #4185 from donnydavis/patch-1OpenShift Bot2017-05-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixed for python3 with Fedora 25 AtomicDonny Davis2017-05-141-1/+1
* | | | | | | | Merge pull request #4178 from mtnbikenc/fix-templatingOpenShift Bot2017-05-167-2/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Fix templating of static service filesRussell Teague2017-05-127-2/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #4187 from giuseppe/uninstall-container-engineOpenShift Bot2017-05-151-0/+7
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | uninstall: handle container-engineGiuseppe Scrivano2017-05-151-0/+7
* | | | | | | Merge pull request #4193 from ashcrow/1448998Scott Dodson2017-05-152-8/+8
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | byo inventory versions 1.5 -> 3.6Steve Milner2017-05-151-4/+4
| * | | | | | byo inventory versions 3.5 -> 3.6Steve Milner2017-05-151-4/+4
|/ / / / / /
* | | | | | Merge pull request #4184 from ashcrow/rslaveOpenShift Bot2017-05-142-12/+16
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add docker package for container-engine installSteve Milner2017-05-142-12/+16
|/ / / / /
* | | | | Automatic commit of package [openshift-ansible] release [3.6.68-1].Jenkins CD Merge Bot2017-05-132-2/+50
* | | | | Merge pull request #4113 from jcantrill/bz1448860_make_recovery_after_nodes_t...OpenShift Bot2017-05-133-14/+6
|\ \ \ \ \
| * | | | | bug 1448860. Change recovery_after_nodes to match node_quorumJeff Cantrill2017-05-113-14/+6
* | | | | | Merge pull request #4155 from ewolinetz/registry_console_upgradeOpenShift Bot2017-05-131-0/+22
|\ \ \ \ \ \
| * | | | | | Updating registry-console image version during a post_control_plane upgradeewolinetz2017-05-121-0/+22
* | | | | | | Merge pull request #4174 from ashcrow/remove-userland-proxyOpenShift Bot2017-05-121-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove userland-proxy-path from daemon.jsonSteve Milner2017-05-121-2/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #4172 from ashcrow/1450307OpenShift Bot2017-05-123-12/+10
|\ \ \ \ \ \ \
| * | | | | | | Fix whistespace issues in custom templateSteve Milner2017-05-121-6/+6
| * | | | | | | Always add proxy items to atomic.confSteve Milner2017-05-121-4/+1
| * | | | | | | Move container-engine systemd environment to updated locationSteve Milner2017-05-122-2/+3
| |/ / / / / /
* | | | | | | Merge pull request #4030 from liggitt/reserved-namespacesOpenShift Bot2017-05-122-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Reserve kubernetes and 'kubernetes-' prefixed namespacesJordan Liggitt2017-04-272-0/+4
* | | | | | | | Merge pull request #4162 from jcantrill/bz1439451_kibana_crashOpenShift Bot2017-05-122-10/+33
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | bug 1441369. Kibana memory limitsJeff Cantrill2017-05-112-10/+33
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #4126 from VincentS/SDN_Check_FixJan Chaloupka2017-05-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix for OpenShift SDN CheckVincent Schwarzer2017-05-091-1/+1
| | |_|_|_|_|/ | |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 11:10:41 +0000