summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* crio: use systemd managerGiuseppe Scrivano2017-10-091-1/+1
* Merge pull request #5682 from tbielawa/openshift_managementScott Dodson2017-10-0946-341/+351
|\
| * Rename openshift_cfme role to openshift_managementTim Bielawa2017-10-0646-341/+351
* | Automatic commit of package [openshift-ansible] release [3.7.0-0.145.0].Jenkins CD Merge Bot2017-10-092-2/+12
* | Merge pull request #5696 from ingvagabund/add-missing-handler-to-flannelJan Chaloupka2017-10-091-0/+9
|\ \
| * | add missing restart node handler to flannelJan Chaloupka2017-10-091-0/+9
|/ /
* | Merge pull request #5684 from enj/enj/i/configmap_lockOpenShift Merge Robot2017-10-071-0/+5
|\ \
| * | Switch to configmap leader election on 3.7 upgradeMonis Khan2017-10-061-0/+5
| |/
* | Merge pull request #5661 from giuseppe/crio-use-overlay-instead-of-overlay2OpenShift Merge Robot2017-10-071-3/+25
|\ \
| * | crio.conf.j2: sync from upstreamGiuseppe Scrivano2017-10-061-1/+23
| * | cri-o: use overlay instead of overlay2Giuseppe Scrivano2017-10-061-2/+2
| |/
* | Merge pull request #5680 from mgugino-upstream-stage/ensure-docker-restarts-w...OpenShift Merge Robot2017-10-062-1/+4
|\ \ | |/ |/|
| * Ensure docker is restarted when iptables is restartedMichael Gugino2017-10-062-1/+4
* | Merge pull request #5660 from sdodson/one-exampleScott Dodson2017-10-062-970/+30
|\ \
| * | Stop including origin and ose hosts example fileScott Dodson2017-10-062-970/+30
|/ /
* | Merge pull request #4820 from dcbw/revert-change-requires-to-wants-openvswitchOpenShift Merge Robot2017-10-062-0/+2
|\ \
| * | node: make node service PartOf=openvswitch.service when openshift-sdn is usedDan Williams2017-10-052-0/+2
| |/
* | Automatic commit of package [openshift-ansible] release [3.7.0-0.144.0].Jenkins CD Merge Bot2017-10-062-2/+47
* | Merge pull request #5679 from mgugino-upstream-stage/fix-etcd-typoScott Dodson2017-10-051-1/+1
|\ \ | |/ |/|
| * fix typo for default in etcdMichael Gugino2017-10-051-1/+1
|/
* Merge pull request #5673 from ewolinetz/bz1497041Scott Dodson2017-10-051-1/+1
|\
| * Bumping version of service catalog image for 3.7Eric Wolinetz2017-10-051-1/+1
* | Merge pull request #5336 from tbielawa/cfme_4.6OpenShift Merge Robot2017-10-0553-1253/+5059
|\ \
| * | Fix lint errorTim Bielawa2017-10-041-10/+10
| * | Remove the no-longer-used App/DB pv size override variables from inventoriesTim Bielawa2017-10-042-15/+0
| * | Add notes about SA token. Improve NFS validation.Tim Bielawa2017-10-045-37/+107
| * | Hooks for installing CFME during full openshift installationTim Bielawa2017-10-044-30/+28
| * | DocumentationTim Bielawa2017-10-045-106/+294
| * | Import upstream templates. Do the work. Validate parameters.Tim Bielawa2017-10-0443-494/+2846
| * | CFME 4.6 work begins. CFME 4.5 references added to the release-3.6 branchTim Bielawa2017-10-0426-1186/+2399
* | | Merge pull request #5644 from etsauer/installer-image-directory-supportScott Dodson2017-10-052-2/+7
|\ \ \ | |_|/ |/| |
| * | Adding support for an inventory directory/hybrid inventoryEric Sauer2017-10-032-2/+7
* | | Merge pull request #5605 from mgugino-upstream-stage/build-provision-splitOpenShift Merge Robot2017-10-0515-137/+187
|\ \ \
| * | | fix master-facts for provisioningMichael Gugino2017-10-022-4/+4
| * | | Make provisioning steps more reusableMichael Gugino2017-10-0215-137/+187
* | | | Merge pull request #5637 from wozniakjan/1496271_fixOpenShift Merge Robot2017-10-056-13/+28
|\ \ \ \
| * | | | Bug 1496271 - Perserve SCC for ES local persistent storageJeff Cantrill2017-10-035-6/+10
| * | | | bug 1482661. Preserve ES dc nodeSelector and supplementalGroupsJeff Cantrill2017-09-295-7/+18
* | | | | Merge pull request #5658 from sosiouxme/20171004-groups-for-checksOpenShift Merge Robot2017-10-0519-116/+122
|\ \ \ \ \
| * | | | | openshift_checks: lb and nfs do not need dockerLuke Meyer2017-10-042-5/+7
| * | | | | openshift_checks: use oo group names everywhereLuke Meyer2017-10-0419-112/+116
* | | | | | Merge pull request #5564 from jcantrill/es_promOpenShift Merge Robot2017-10-057-5/+159
|\ \ \ \ \ \
| * | | | | | Add logging es prometheus endpointJeff Cantrill2017-10-037-5/+159
* | | | | | | Merge pull request #5616 from wozniakjan/logging/elasticsearch/honor_es_cpu_s...OpenShift Merge Robot2017-10-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | logging: honor openshift_logging_es_cpu_limitJan Wozniak2017-10-021-1/+1
* | | | | | | | Merge pull request #5636 from mgugino-upstream-stage/limit-openshift-version-...OpenShift Merge Robot2017-10-041-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Limit hosts that run openshift_version roleMichael Gugino2017-10-031-2/+2
* | | | | | | | | Merge pull request #5647 from mgugino-upstream-stage/docker-reg-auth-after-startOpenShift Merge Robot2017-10-041-12/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ensure docker service started prior to credentialsMichael Gugino2017-10-031-12/+12
* | | | | | | | | | Merge pull request #5543 from ewolinetz/bz1495150OpenShift Merge Robot2017-10-041-4/+0
|\ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 23:34:00 +0000