summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6084 from mgugino-upstream-stage/combine-master-upgradeOpenShift Merge Robot2017-11-1510-98/+79
|\
| * Combine master upgrade play with roleMichael Gugino2017-11-0911-108/+79
* | Merge pull request #6105 from kwoodson/docker_crio_fixScott Dodson2017-11-151-1/+1
|\ \
| * | Fixing islnk.Kenny Woodson2017-11-131-1/+1
* | | Added aos-3.8 releaser for titoJenkins CD Merge Bot2017-11-151-0/+4
* | | Merge pull request #6079 from mgugino-upstream-stage/fix-log-local-factsOpenShift Merge Robot2017-11-151-1/+1
|\ \ \
| * | | Fix stale data in openshift_facts for loggingMichael Gugino2017-11-091-1/+1
| | |/ | |/|
* | | Merge pull request #5968 from mgugino-upstream-stage/version-scrubScott Dodson2017-11-1528-285/+16
|\ \ \
| * | | Removed old version codeMichael Gugino2017-11-1428-285/+16
* | | | Automatic commit of package [openshift-ansible] release [3.8.0-0.1.0].Jenkins CD Merge Bot2017-11-152-2/+34
* | | | Merge pull request #6051 from mgugino-upstream-stage/docker-containers-proposalOpenShift Merge Robot2017-11-151-0/+113
|\ \ \ \
| * | | | Proposal: container_runtime roleMichael Gugino2017-11-071-0/+113
* | | | | Merge pull request #6094 from mgugino-upstream-stage/syscontainers-docker-log...OpenShift Merge Robot2017-11-1512-2/+299
|\ \ \ \ \
| * | | | | Alternative method to create docker registry auth credsMichael Gugino2017-11-1412-2/+299
* | | | | | Merge pull request #5846 from kwoodson/cluster_install_orderOpenShift Merge Robot2017-11-153-4/+53
|\ \ \ \ \ \
| * | | | | | Updating provisioning order.Kenny Woodson2017-11-133-4/+53
| |/ / / / /
* | | | | | Merge pull request #5967 from gregswift/uninstallOpenShift Merge Robot2017-11-151-14/+55
|\ \ \ \ \ \
| * | | | | | Cleans up additional artifacts in uninstall. Closes 3082Greg Swift2017-10-311-14/+55
* | | | | | | Merge pull request #6102 from mgugino-upstream-stage/fix-docker-reg-auth-proxyOpenShift Merge Robot2017-11-141-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Run registry auth after docker restartMichael Gugino2017-11-131-2/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #6095 from kwoodson/add_instance_profile_supportOpenShift Merge Robot2017-11-149-0/+88
|\ \ \ \ \ \ \
| * | | | | | | Adding instance profile support for node groups.Kenny Woodson2017-11-139-0/+88
| |/ / / / / /
* | | | | | | Merge pull request #6091 from sosiouxme/20171110-ini-parse-failureOpenShift Merge Robot2017-11-142-0/+8
|\ \ \ \ \ \ \
| * | | | | | | ansible.cfg: error when inventory does not parseLuke Meyer2017-11-102-0/+8
* | | | | | | | Merge pull request #6081 from kwoodson/remove_oc_edit_restrictionsOpenShift Merge Robot2017-11-142-28/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | removing kind restrictions from oc_editKenny Woodson2017-11-092-28/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #6068 from mtnbikenc/remove-old-upgradesOpenShift Merge Robot2017-11-1433-1389/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove upgrade playbooks for 3.3 through 3.5Russell Teague2017-11-0833-1389/+8
* | | | | | | | | Merge pull request #6115 from sdodson/disable-auth-migrationScott Dodson2017-11-142-20/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow disabling authorization migration checkScott Dodson2017-11-142-20/+24
* | | | | | | | | | Merge pull request #6054 from nak3/cleanup-lbOpenShift Merge Robot2017-11-141-0/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Remove remaining haproxy files with uninstallationKenjiro Nakayama2017-11-081-0/+4
* | | | | | | | | | Merge pull request #5948 from mtnbikenc/checkpoint-timesOpenShift Merge Robot2017-11-1417-175/+191
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add execution times to checkpoint statusRussell Teague2017-10-3117-175/+191
* | | | | | | | | | Merge pull request #6110 from sdodson/dockershimScott Dodson2017-11-141-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Nuke /var/lib/dockershim/sandbox/* while nodes are drainedScott Dodson2017-11-141-0/+6
* | | | | | | | | | | Merge pull request #5784 from jarrpa/glusterfs-new-featuresOpenShift Merge Robot2017-11-1416-61/+655
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | GlusterFS: Add gluster-s3 functionalityJose A. Rivera2017-11-088-45/+420
| * | | | | | | | | | | GlusterFS: Add glusterblock functionalityJose A. Rivera2017-11-089-0/+210
| * | | | | | | | | | | GlusterFS: Update heketi templates for latest versionJose A. Rivera2017-11-088-16/+22
| * | | | | | | | | | | GlusterFS: Specify resource requestsJose A. Rivera2017-11-081-1/+4
* | | | | | | | | | | | Merge pull request #5942 from giuseppe/crio-sync-configurationScott Dodson2017-11-141-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | crio: sync crio.confGiuseppe Scrivano2017-11-141-0/+5
* | | | | | | | | | | | Merge pull request #5921 from lpsantil/make-nfs-clearMichael Gugino2017-11-141-6/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Make clearer *_nfs_directory and *_volume_namelpsantil2017-10-281-6/+18
* | | | | | | | | | | | Merge pull request #6101 from mgugino-upstream-stage/fix-tsb-jsonScott Dodson2017-11-135-17/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix extension script for catalogMichael Gugino2017-11-135-17/+10
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6104 from kwoodson/regex_cors_fixScott Dodson2017-11-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Regex anchors changed to match protocol start and ports.Kenny Woodson2017-11-131-2/+2
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6072 from tbielawa/obvious_docsOpenShift Merge Robot2017-11-131-15/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |