summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3398 from dgoodwin/revert-upgrade-hackScott Dodson2017-02-171-9/+0
|\
| * Revert temporary hack to skip router/registry upgrade.Devan Goodwin2017-02-171-9/+0
|/
* Merge pull request #3395 from sdodson/ruamel-yaml-atomicScott Dodson2017-02-162-0/+12
|\
| * Don't attempt to install python-ruamel-yaml on atomicScott Dodson2017-02-162-0/+12
|/
* Merge pull request #3383 from kwoodson/yedit_yaml_supportScott Dodson2017-02-1621-315/+929
|\
| * Pleasing the linting gods.Kenny Woodson2017-02-1619-81/+213
| * Fixed tests for pyyaml vs ruamel. Added import logic. Fixed safe load.Kenny Woodson2017-02-1618-95/+297
| * Adding fallback support for pyyaml.Kenny Woodson2017-02-1618-205/+485
* | Merge pull request #3386 from bparees/bump_templatesScott Dodson2017-02-169-10/+37
|\ \
| * | update example templates+imagestreamsBen Parees2017-02-169-10/+37
| |/
* | Merge pull request #3370 from adbaldi/workScott Dodson2017-02-164-4/+4
|\ \ | |/ |/|
| * Fixed issue where upgrade fails when using daemon sets (e.g. aggregated logging)Andrew Baldi2017-02-154-4/+4
* | Merge pull request #3381 from jcantrill/bz_1420217_default_es_memoryEric Wolinetz2017-02-161-2/+2
|\ \
| * | bug 1420217. Default ES memory to be compariable to 3.4 deployerJeff Cantrill2017-02-161-2/+2
* | | Merge pull request #3374 from mwringe/hawkular-metrics-certificatesScott Dodson2017-02-162-2/+2
|\ \ \
| * | | Add missing full hostname for the Hawkular Metrics certificate (BZ1421060)mwringe2017-02-152-2/+2
* | | | Merge pull request #3375 from abutcher/revert-openshift-facts-skipScott Dodson2017-02-161-60/+46
|\ \ \ \
| * | | | Revert "Add block+when skip to `openshift_facts` tasks"Andrew Butcher2017-02-151-60/+46
| |/ / /
* | | | Merge pull request #3373 from ewolinetz/logging_fix_kibana_routesScott Dodson2017-02-164-6/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | adding some quotes for safetyewolinetz2017-02-151-1/+1
| * | | fixing use of oc_scale moduleewolinetz2017-02-152-2/+2
| * | | fixing default for loggingewolinetz2017-02-151-3/+3
| |/ /
* | | Merge pull request #3380 from ingvagabund/initialize-nodes-to-upgrade-when-ru...Scott Dodson2017-02-163-0/+9
|\ \ \ | |/ / |/| |
| * | initialize oo_nodes_to_upgrade group when running control plane upgrade onlyJan Chaloupka2017-02-163-0/+9
|/ /
* | Merge pull request #3371 from detiber/fixLintScott Dodson2017-02-151-1/+0
|\ \
| * | Fix some lintJason DeTiberus2017-02-151-1/+0
|/ /
* | Merge pull request #3364 from detiber/lintCleanupScott Dodson2017-02-155-8/+18
|\ \
| * | Ansible Lint cleanup and making filter/lookup plugins used by openshift_maste...Jason DeTiberus2017-02-145-8/+18
* | | Merge pull request #3367 from soltysh/upgrade_jobsScott Dodson2017-02-153-0/+23
|\ \ \
| * | | Add upgrade job step after the entire upgrade performsMaciej Szulik2017-02-153-0/+23
| | |/ | |/|
* | | Merge pull request #3368 from ingvagabund/fix-path-to-disabled-exclude-in-34-...Jan Chaloupka2017-02-151-1/+1
|\ \ \ | |/ / |/| |
| * | upgrades: fix path to disable_excluder.ymlJan Chaloupka2017-02-151-1/+1
|/ /
* | Merge pull request #3332 from giuseppe/system-containers-haGiuseppe Scrivano2017-02-157-13/+81
|\ \
| * | node, vars/main.yml: define l_is_ha and l_is_same_versionGiuseppe Scrivano2017-02-143-10/+10
| * | master, vars/main.yml: define l_is_ha and l_is_same_versionGiuseppe Scrivano2017-02-142-12/+15
| * | node: simplify when conditionalsGiuseppe Scrivano2017-02-101-2/+5
| * | openvswitch: simplify when conditionalsGiuseppe Scrivano2017-02-101-4/+5
| * | uninstall: delete master-api and master-controllersGiuseppe Scrivano2017-02-101-0/+16
| * | master: support HA deployments with system containersGiuseppe Scrivano2017-02-102-2/+47
* | | Merge pull request #3362 from ashcrow/1421033Scott Dodson2017-02-141-1/+2
|\ \ \
| * | | Update variant_versionSteve Milner2017-02-141-1/+2
|/ / /
* | | Merge pull request #3350 from mwringe/bz1421860Scott Dodson2017-02-142-4/+4
|\ \ \ | |_|/ |/| |
| * | BZ1421860: increase Heapster's metric resolution to 30smwringe2017-02-132-4/+4
* | | Merge pull request #3351 from detiber/fixConfigClobberJason DeTiberus2017-02-1422-66/+22
|\ \ \
| * | | Fix cases where child classes override OpenShiftCLI valuesJason DeTiberus2017-02-1322-66/+22
| |/ /
* | | Merge pull request #3355 from tbielawa/idempotency_please_workScott Dodson2017-02-147-46/+100
|\ \ \
| * | | Add block+when skip to `openshift_facts` tasksTim Bielawa2017-02-141-46/+58
| * | | Trying to fix up/audit note some changesTim Bielawa2017-02-146-0/+42
* | | | Merge pull request #3359 from ewolinetz/logging_metrics_defaultsScott Dodson2017-02-142-2/+2
|\ \ \ \
| * | | | updating defaults for logging and metrics rolesewolinetz2017-02-142-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 12:10:49 +0000